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

Merge branch 'master' into addBetterMakefileDebugFlags

Browse source
This commit is contained in:
Gabriel Ravier 2019-05-07 12:15:47 +02:00
commit d131737d2e
54 changed files with 1021 additions and 1019 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ArmsItem.cpp
View file

@ -57,6 +57,7 @@ BOOL AddArmsData(long code, long max_num)
gArmsData[i].level = 1; gArmsData[i].level = 1;
} }
// Set weapon and ammo
gArmsData[i].code = code; gArmsData[i].code = code;
gArmsData[i].max_num += max_num; gArmsData[i].max_num += max_num;
gArmsData[i].num += max_num; gArmsData[i].num += max_num;
@ -85,6 +86,7 @@ BOOL SubArmsData(long code)
for (i += 1; i < ARMS_MAX; ++i) for (i += 1; i < ARMS_MAX; ++i)
gArmsData[i - 1] = gArmsData[i]; gArmsData[i - 1] = gArmsData[i];
// Clear farthest weapon and select first
gArmsData[i - 1].code = 0; gArmsData[i - 1].code = 0;
gSelectedArms = 0; gSelectedArms = 0;
return TRUE; return TRUE;

2
src/Types.h
View file

@ -1,3 +1,3 @@
#pragma once #pragma once
//This was originally some sort of POSIX standard thing? leftover from the linux port //This was originally some sort of POSIX standard thing? leftover from the Linux port