Merge branch 'master' of https://github.com/cuckydev/Cave-Story-Engine-2

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.

src/NpcAct300.cpp

@@ -152,6 +152,7 @@ void ActNpc302(NPCHAR *npc)
 						break;
 					}
 				}
+				
 				if (i == 0x200)
 				{
 					npc->cond = 0;