diff --git a/src/Main.cpp b/src/Main.cpp index 06cbaf2a..05e8621b 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -97,7 +97,7 @@ int main(int argc, char *argv[]) //Get path of the data folder strcpy(gDataPath, gModulePath); - memcpy(&gDataPath[strlen(gDataPath)], "/data", 6); //Pixel didn't use a strcat + strcat(gDataPath, "/data"); #ifdef WINDOWS // Set the window icons. See res/ICON/ICON.rc. diff --git a/src/NpcAct300.cpp b/src/NpcAct300.cpp index 49e62188..746f9aaf 100644 --- a/src/NpcAct300.cpp +++ b/src/NpcAct300.cpp @@ -152,6 +152,7 @@ void ActNpc302(NPCHAR *npc) break; } } + if (i == 0x200) { npc->cond = 0;