thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2024-11-08 08:47:17 +01:00
Code Releases Activity

More missing weapon identifiers. Related to #23

Browse Source 
Fix the max value for the various identifier groups.
This commit is contained in:
Sandu Liviu Catalin 2016-07-28 21:10:07 +03:00
parent 0c324557f6
commit 3b925c21d5
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/Constants.cpp
View File

@ -413,12 +413,13 @@ static const EnumElement g_WeaponEnum[] = {
{_SC("HeliCannon"), SQMOD_WEAPON_HELICANNON}, {_SC("HeliCannon"), SQMOD_WEAPON_HELICANNON},
{_SC("Camera"), SQMOD_WEAPON_CAMERA}, {_SC("Camera"), SQMOD_WEAPON_CAMERA},
{_SC("Vehicle"), SQMOD_WEAPON_VEHICLE}, {_SC("Vehicle"), SQMOD_WEAPON_VEHICLE},
{_SC("HeliBlades1"), SQMOD_WEAPON_HELIBLADES1},
{_SC("Explosion1"), SQMOD_WEAPON_EXPLOSION1}, {_SC("Explosion1"), SQMOD_WEAPON_EXPLOSION1},
{_SC("Driveby"), SQMOD_WEAPON_DRIVEBY}, {_SC("Driveby"), SQMOD_WEAPON_DRIVEBY},
{_SC("Drowned"), SQMOD_WEAPON_DROWNED}, {_SC("Drowned"), SQMOD_WEAPON_DROWNED},
{_SC("Fall"), SQMOD_WEAPON_FALL}, {_SC("Fall"), SQMOD_WEAPON_FALL},
{_SC("Explosion2"), SQMOD_WEAPON_EXPLOSION2}, {_SC("Explosion2"), SQMOD_WEAPON_EXPLOSION2},
{_SC("HeliBlades"), SQMOD_WEAPON_HELIBLADES}, {_SC("HeliBlades2"), SQMOD_WEAPON_HELIBLADES2},
{_SC("Suicide"), SQMOD_WEAPON_SUICIDE}, {_SC("Suicide"), SQMOD_WEAPON_SUICIDE},
{_SC("Launcher"), SQMOD_WEAPON_ROCKETLAUNCHER}, {_SC("Launcher"), SQMOD_WEAPON_ROCKETLAUNCHER},
{_SC("Max"), SQMOD_WEAPON_MAX} {_SC("Max"), SQMOD_WEAPON_MAX}

9
source/Misc/Weapon.cpp
View File

@ -131,13 +131,16 @@ Int32 GetWeaponID(CCStr name)
// Default to unknwon // Default to unknwon
else return SQMOD_UNKNOWN; else return SQMOD_UNKNOWN;
// [H]ammer // [H]ammer
// [H]eliblades // [H]eliblades1/A
// [H]eliblades2/B
// [H]elicannon // [H]elicannon
case 'h': case 'h':
// [Ha]mmer // [Ha]mmer
if (b == 'a') return SQMOD_WEAPON_HAMMER; if (b == 'a') return SQMOD_WEAPON_HAMMER;
// [He]li[b]lade[s] // [He]li[b]lades[1/A]
else if (b == 'e' && (d == 's' || d == 'b' || (len > 4 && str[4] == 'b'))) return SQMOD_WEAPON_HELIBLADES; else if (b == 'e' && (c == 'b' || (len > 4 && str[4] == 'b')) && (d == '1' || d == 'a')) return SQMOD_WEAPON_HELIBLADES1;
// [He]li[b]lades[2/B]
else if (b == 'e' && (c == 'b' || (len > 4 && str[4] == 'b')) && (d == '2' || d == 'b')) return SQMOD_WEAPON_HELIBLADES2;
// [He]li[c]anno[n] // [He]li[c]anno[n]
else if (b == 'e' && (d == 'c' || d == 'n' || (len > 4 && str[4] == 'c'))) return SQMOD_WEAPON_HELICANNON; else if (b == 'e' && (d == 'c' || d == 'n' || (len > 4 && str[4] == 'c'))) return SQMOD_WEAPON_HELICANNON;
// Default to unknwon // Default to unknwon

17
source/SqBase.hpp
View File

@ -631,7 +631,7 @@ enum EntityType
#define SQMOD_PLAYER_ACTION_WASTED 55 #define SQMOD_PLAYER_ACTION_WASTED 55
#define SQMOD_PLAYER_ACTION_ENTERING_VEHICLE 58 #define SQMOD_PLAYER_ACTION_ENTERING_VEHICLE 58
#define SQMOD_PLAYER_ACTION_EXITING_VEHICLE 60 #define SQMOD_PLAYER_ACTION_EXITING_VEHICLE 60
#define SQMOD_PLAYER_ACTION_MAX 61 #define SQMOD_PLAYER_ACTION_MAX 60
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------
* WEATHER IDENTIFIERS * WEATHER IDENTIFIERS
@ -651,7 +651,7 @@ enum EntityType
#define SQMOD_WEATHER_LIGHTCLOUDY 7 #define SQMOD_WEATHER_LIGHTCLOUDY 7
#define SQMOD_WEATHER_OVERCASTCLOUDY 8 #define SQMOD_WEATHER_OVERCASTCLOUDY 8
#define SQMOD_WEATHER_BLACKCLOUDS 9 #define SQMOD_WEATHER_BLACKCLOUDS 9
#define SQMOD_WEATHER_MAX 10 #define SQMOD_WEATHER_MAX 9
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------
@ -695,14 +695,15 @@ enum EntityType
#define SQMOD_WEAPON_HELICANNON 35 #define SQMOD_WEAPON_HELICANNON 35
#define SQMOD_WEAPON_CAMERA 36 #define SQMOD_WEAPON_CAMERA 36
#define SQMOD_WEAPON_VEHICLE 39 #define SQMOD_WEAPON_VEHICLE 39
#define SQMOD_WEAPON_HELIBLADES1 40
#define SQMOD_WEAPON_EXPLOSION1 41 #define SQMOD_WEAPON_EXPLOSION1 41
#define SQMOD_WEAPON_DRIVEBY 42 #define SQMOD_WEAPON_DRIVEBY 42
#define SQMOD_WEAPON_DROWNED 43 #define SQMOD_WEAPON_DROWNED 43
#define SQMOD_WEAPON_FALL 44 #define SQMOD_WEAPON_FALL 44
#define SQMOD_WEAPON_EXPLOSION2 51 #define SQMOD_WEAPON_EXPLOSION2 51
#define SQMOD_WEAPON_HELIBLADES 60 #define SQMOD_WEAPON_HELIBLADES2 60
#define SQMOD_WEAPON_SUICIDE 70 #define SQMOD_WEAPON_SUICIDE 70
#define SQMOD_WEAPON_MAX 71 #define SQMOD_WEAPON_MAX 70
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------
* VEHICLE IDENTIFIERS * VEHICLE IDENTIFIERS
@ -833,7 +834,7 @@ enum EntityType
#define SQMOD_VEHICLE_POLICECHEETAH 236 #define SQMOD_VEHICLE_POLICECHEETAH 236
#define SQMOD_VEHICLE_FBICHEETAH 236 #define SQMOD_VEHICLE_FBICHEETAH 236
#define SQMOD_VEHICLE_CHEETAH2 236 #define SQMOD_VEHICLE_CHEETAH2 236
#define SQMOD_VEHICLE_MAX 237 #define SQMOD_VEHICLE_MAX 236
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------
* SKIN IDENTIFIERS * SKIN IDENTIFIERS
@ -997,7 +998,7 @@ enum EntityType
#define SQMOD_SKIN_STRIPPER_B 157 #define SQMOD_SKIN_STRIPPER_B 157
#define SQMOD_SKIN_STRIPPER_C 158 #define SQMOD_SKIN_STRIPPER_C 158
#define SQMOD_SKIN_STORE_CLERK 159 #define SQMOD_SKIN_STORE_CLERK 159
#define SQMOD_SKIN_MAX 160 #define SQMOD_SKIN_MAX 159
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------
* KEYBOARD CODES * KEYBOARD CODES
@ -1194,7 +1195,7 @@ enum EntityType
#define SQMOD_KEYCODE_XBUTTON1 0x05 #define SQMOD_KEYCODE_XBUTTON1 0x05
#define SQMOD_KEYCODE_XBUTTON2 0x06 #define SQMOD_KEYCODE_XBUTTON2 0x06
#define SQMOD_KEYCODE_NONE 0xFF #define SQMOD_KEYCODE_NONE 0xFF
#define SQMOD_KEYCODE_MAX 0x100 #define SQMOD_KEYCODE_MAX 0xFF
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------
* ASCII CHARACTER CODES * ASCII CHARACTER CODES
@ -1327,6 +1328,6 @@ enum EntityType
#define SQMOD_ASCII_CLOSING_BRACE 125 #define SQMOD_ASCII_CLOSING_BRACE 125
#define SQMOD_ASCII_TILDE 126 #define SQMOD_ASCII_TILDE 126
#define SQMOD_ASCII_UNDEFINED 127 #define SQMOD_ASCII_UNDEFINED 127
#define SQMOD_ASCII_MAX 128 #define SQMOD_ASCII_MAX 127
#endif // _SQBASE_HPP_ #endif // _SQBASE_HPP_