duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revamped NpChar, NpcHit and NpcTbl

Browse source 
Also changed regex to "((//|\;)[^
\t\n]|(for|while|if|while|do|void|int|bool)\((for|while|if|while|do)\
\(.*\)\;|\(\ |\ \)|//\ [a-z]|\ \ )|break;\n[\t]*[^\n\t\}(\/\/
Fallthrough]|[^\t\n]\{[^\n]|[^\n\t]\}[^\n]"

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
Gabriel Ravier 2019-06-13 20:34:11 +02:00
parent f9d62f38ef
commit 06e65cad6e
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
3 changed files with 77 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/NpChar.cpp
View file

@ -251,9 +251,11 @@ BOOL SetBulletObject(int x, int y, int val)
case 5: case 5:
tamakazu_ari[t++] = 0; tamakazu_ari[t++] = 0;
break; break;
case 10: case 10:
tamakazu_ari[t++] = 1; tamakazu_ari[t++] = 1;
break; break;
default: default:
tamakazu_ari[t] = 0; tamakazu_ari[t] = 0;
break; break;
@ -601,9 +603,11 @@ void DeleteNpCharCode(int code, BOOL bSmoke)
case 1: case 1:
SetDestroyNpChar(gNPC[n].x, gNPC[n].y, gNPC[n].view.back, 4); SetDestroyNpChar(gNPC[n].x, gNPC[n].y, gNPC[n].view.back, 4);
break; break;
case 2: case 2:
SetDestroyNpChar(gNPC[n].x, gNPC[n].y, gNPC[n].view.back, 8); SetDestroyNpChar(gNPC[n].x, gNPC[n].y, gNPC[n].view.back, 8);
break; break;
case 3: case 3:
SetDestroyNpChar(gNPC[n].x, gNPC[n].y, gNPC[n].view.back, 16); SetDestroyNpChar(gNPC[n].x, gNPC[n].y, gNPC[n].view.back, 16);
break; break;

2
src/NpcHit.cpp
View file

@ -469,9 +469,11 @@ void LoseNpChar(NPCHAR *npc, BOOL bVanish)
case 1: case 1:
SetDestroyNpChar(npc->x, npc->y, npc->view.back, 3); SetDestroyNpChar(npc->x, npc->y, npc->view.back, 3);
break; break;
case 2: case 2:
SetDestroyNpChar(npc->x, npc->y, npc->view.back, 7); SetDestroyNpChar(npc->x, npc->y, npc->view.back, 7);
break; break;
case 3: case 3:
SetDestroyNpChar(npc->x, npc->y, npc->view.back, 12); SetDestroyNpChar(npc->x, npc->y, npc->view.back, 12);
break; break;

40
src/NpcTbl.cpp
View file

@ -38,46 +38,46 @@ BOOL LoadNpcTable(const char *path)
} }
#ifdef NONPORTABLE #ifdef NONPORTABLE
for (n = 0; n < num; n++) //bits for (n = 0; n < num; n++) // Bits
fread(&gNpcTable[n].bits, 2, 1, fp); fread(&gNpcTable[n].bits, 2, 1, fp);
for (n = 0; n < num; n++) //life for (n = 0; n < num; n++) // Life
fread(&gNpcTable[n].life, 2, 1, fp); fread(&gNpcTable[n].life, 2, 1, fp);
for (n = 0; n < num; n++) //surf for (n = 0; n < num; n++) // Surf
fread(&gNpcTable[n].surf, 1, 1, fp); fread(&gNpcTable[n].surf, 1, 1, fp);
for (n = 0; n < num; n++) //destroy_voice for (n = 0; n < num; n++) // Destroy_voice
fread(&gNpcTable[n].destroy_voice, 1, 1, fp); fread(&gNpcTable[n].destroy_voice, 1, 1, fp);
for (n = 0; n < num; n++) //hit_voice for (n = 0; n < num; n++) // Hit_voice
fread(&gNpcTable[n].hit_voice, 1, 1, fp); fread(&gNpcTable[n].hit_voice, 1, 1, fp);
for (n = 0; n < num; n++) //size for (n = 0; n < num; n++) // Size
fread(&gNpcTable[n].size, 1, 1, fp); fread(&gNpcTable[n].size, 1, 1, fp);
for (n = 0; n < num; n++) //exp for (n = 0; n < num; n++) // Exp
fread(&gNpcTable[n].exp, 4, 1, fp); fread(&gNpcTable[n].exp, 4, 1, fp);
for (n = 0; n < num; n++) //damage for (n = 0; n < num; n++) // Damage
fread(&gNpcTable[n].damage, 4, 1, fp); fread(&gNpcTable[n].damage, 4, 1, fp);
for (n = 0; n < num; n++) //hit for (n = 0; n < num; n++) // Hit
fread(&gNpcTable[n].hit, 4, 1, fp); fread(&gNpcTable[n].hit, 4, 1, fp);
for (n = 0; n < num; n++) //view for (n = 0; n < num; n++) // View
fread(&gNpcTable[n].view, 4, 1, fp); fread(&gNpcTable[n].view, 4, 1, fp);
#else #else
for (n = 0; n < num; n++) //bits for (n = 0; n < num; n++) // Bits
gNpcTable[n].bits = File_ReadLE16(fp); gNpcTable[n].bits = File_ReadLE16(fp);
for (n = 0; n < num; n++) //life for (n = 0; n < num; n++) // Life
gNpcTable[n].life = File_ReadLE16(fp); gNpcTable[n].life = File_ReadLE16(fp);
for (n = 0; n < num; n++) //surf for (n = 0; n < num; n++) // Surf
fread(&gNpcTable[n].surf, 1, 1, fp); fread(&gNpcTable[n].surf, 1, 1, fp);
for (n = 0; n < num; n++) //destroy_voice for (n = 0; n < num; n++) // Destroy_voice
fread(&gNpcTable[n].destroy_voice, 1, 1, fp); fread(&gNpcTable[n].destroy_voice, 1, 1, fp);
for (n = 0; n < num; n++) //hit_voice for (n = 0; n < num; n++) // Hit_voice
fread(&gNpcTable[n].hit_voice, 1, 1, fp); fread(&gNpcTable[n].hit_voice, 1, 1, fp);
for (n = 0; n < num; n++) //size for (n = 0; n < num; n++) // Size
fread(&gNpcTable[n].size, 1, 1, fp); fread(&gNpcTable[n].size, 1, 1, fp);
for (n = 0; n < num; n++) //exp for (n = 0; n < num; n++) // Exp
gNpcTable[n].exp = File_ReadLE32(fp); gNpcTable[n].exp = File_ReadLE32(fp);
for (n = 0; n < num; n++) //damage for (n = 0; n < num; n++) // Damage
gNpcTable[n].damage = File_ReadLE32(fp); gNpcTable[n].damage = File_ReadLE32(fp);
for (n = 0; n < num; n++) //hit for (n = 0; n < num; n++) // Hit
fread(&gNpcTable[n].hit, 4, 1, fp); fread(&gNpcTable[n].hit, 4, 1, fp);
for (n = 0; n < num; n++) //view for (n = 0; n < num; n++) // View
fread(&gNpcTable[n].view, 4, 1, fp); fread(&gNpcTable[n].view, 4, 1, fp);
#endif #endif