archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-15 05:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse Source 
# Conflicts:
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	src/audio/AudioManager.h
#	src/control/Garages.cpp
#	src/control/Garages.h
#	src/control/Script5.cpp
#	src/core/config.h
#	utils/gxt/american.txt
#	utils/gxt/spanish.txt
This commit is contained in:
Sergeanur
2021-07-12 04:13:22 +03:00
parent 6a2ce20313 3f5fdc39a5
commit 55d30a11ec
35 changed files with 1343 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/weapons/Weapon.cpp
View File

@ -3285,7 +3285,7 @@ CWeapon::Save(uint8*& buf)
CopyToBuf(buf, m_nAmmoTotal);
CopyToBuf(buf, m_nTimer);
CopyToBuf(buf, m_bAddRotOffset);
SkipSaveBuf(buf, 3);
ZeroSaveBuf(buf, 3);
}
void