mirror of
https://github.com/halpz/re3.git
synced 2025-07-30 08:20:27 +00:00
Merge branch 'master' into miami
# Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioSamples.h # src/audio/soundlist.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/MenuScreens.cpp # src/peds/Ped.cpp # src/peds/PlayerPed.cpp # src/render/Hud.cpp # src/vehicles/Vehicle.h
This commit is contained in:
@ -255,7 +255,7 @@ enum eMenuAction
|
||||
MENUACTION_PARSEHEAP,
|
||||
// MENUACTION_MEMCARDSAVECONFIRM is that on VC enum??
|
||||
MENUACTION_DEBUGSTREAM,
|
||||
MENUACTION_REDEFCTRL,
|
||||
//MENUACTION_KEYBOARDCTRLS,
|
||||
MENUACTION_GETKEY,
|
||||
MENUACTION_SHOWHEADBOB,
|
||||
MENUACTION_UNK80,
|
||||
|
Reference in New Issue
Block a user