Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

0007935: Patch: More ped skin IDs (Improved) #17

Merged
merged 1 commit into from
Dec 15, 2015
Merged

0007935: Patch: More ped skin IDs (Improved) #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions MTA10/game_sa/CGameSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,29 @@ void CGameSA::SetupSpecialCharacters ( void )
ModelInfo[316].MakePedModel ( "COPGRL2" );
ModelInfo[317].MakePedModel ( "NURGRL2" );
*/
// #7935 - Add peds to unused IDs so that servers can add mods to these skins
ushort skins[] = {
3, 4, 5, 6, 8, 42, 65, 74, 86, 119, 149, 208, 239, 273, 289, 329, 340, 382, 383, 398, 399,
612, 613, 614, 662, 663, 665, 666, 667, 668, 699, 793, 794, 795, 796, 797, 798, 799, 907,
908, 909, 965, 999, 1194, 1195, 1196, 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205,
1206, 1326, 1573, 1699, 2883, 2884, 3136, 3137, 3138, 3139, 3140, 3141, 3142, 3143, 3144,
3145, 3146, 3147, 3148, 3149, 3150, 3151, 3152, 3153, 3154, 3155, 3156, 3157, 3158, 3159,
3160, 3161, 3162, 3163, 3164, 3165, 3166, 3176, 3177, 3179, 3180, 3181, 3182, 3183,
3184, 3185, 3186, 3188, 3189, 3190, 3191, 3192, 3194, 3195, 3196, 3197, 3198, 3199, 3200,
3201, 3202, 3203, 3204, 3205, 3206, 3207, 3208, 3209, 3210, 3211, 3212, 3213, 3215,
3216, 3217, 3218, 3219, 3220, 3222, 3223, 3224, 3225, 3226, 3227, 3228, 3229, 3230, 3231,
3232, 3233, 3234, 3235, 3236, 3237, 3238, 3239, 3240, 3245, 3247, 3248, 3251, 3254,
3266, 3348, 3349, 3416, 3429, 3610, 3611, 3784, 3870, 3871, 3883, 3889, 3974, 4542, 4543,
4544, 4545, 4546, 4547, 4548, 4549, 4763, 4764, 4765, 4766, 4767, 4768, 4769, 4770, 4771,
4772, 4773, 4774, 4775, 4776, 4777, 4778, 4779, 4780, 4781, 4782, 4783, 4784, 4785, 4786,
4787, 4788, 4789, 4790, 4791, 4792, 4793, 4794, 4795, 4796, 4797, 4798, 4799, 4800, 4801,
4802, 4803, 4804, 4805, 5090, 5104, 5376, 5377, 5378, 5379, 5380, 5381, 5382, 5383,
5384, 5385, 5386, 5387, 5388, 5389
};
for ( ushort i = 0; i < sizeof ( skins ) / sizeof ( ushort ); i++ )
{
ModelInfo[ skins[i] ].MakePedModel ( "PSYCHO" );
}
}

// Well, has it?
Expand Down
32 changes: 15 additions & 17 deletions MTA10/game_sa/CModelInfoSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,23 +256,21 @@ BOOL CModelInfoSA::IsVehicle ( )

bool CModelInfoSA::IsPlayerModel ( )
{
return ( m_dwModelID == 0 ||
m_dwModelID == 1 ||
m_dwModelID == 2 ||
m_dwModelID == 7 ||
(m_dwModelID >= 9 &&
m_dwModelID != 208 &&
m_dwModelID != 149 &&
m_dwModelID != 119 &&
m_dwModelID != 86 &&
m_dwModelID != 74 &&
m_dwModelID != 65 &&
m_dwModelID != 42 &&
m_dwModelID <= 272) ||
(m_dwModelID >= 274 &&
m_dwModelID <= 288) ||
(m_dwModelID >= 290 &&
m_dwModelID <= 312 ) );
return ( ( m_dwModelID >= 0 && m_dwModelID <= 312 ) || m_dwModelID == 329 || m_dwModelID == 340 || m_dwModelID == 382 ||
m_dwModelID == 383 || m_dwModelID == 398 || m_dwModelID == 399 || ( m_dwModelID >= 612 && m_dwModelID <= 614 ) ||
m_dwModelID == 662 || m_dwModelID == 663 || ( m_dwModelID >= 665 && m_dwModelID <= 699 ) ||
( m_dwModelID >= 793 && m_dwModelID <= 799 ) || ( m_dwModelID >= 907 && m_dwModelID <= 909 ) ||
m_dwModelID == 965 || m_dwModelID == 999 || ( m_dwModelID >= 1194 && m_dwModelID <= 1206 ) ||
m_dwModelID == 1326 || m_dwModelID == 1573 || m_dwModelID == 1699 || m_dwModelID == 2883 || m_dwModelID == 2884 ||
( m_dwModelID >= 3176 && m_dwModelID <= 3197 ) || ( m_dwModelID >= 3215 && m_dwModelID <= 3220 ) ||
m_dwModelID == 3245 || m_dwModelID == 3247 || m_dwModelID == 3248 || m_dwModelID == 3251 || m_dwModelID == 3254 ||
m_dwModelID == 3266 || m_dwModelID == 3348 || m_dwModelID == 3349 || m_dwModelID == 3416 || m_dwModelID == 3429 ||
m_dwModelID == 3610 || m_dwModelID == 3611 || m_dwModelID == 3784 || m_dwModelID == 3870 || m_dwModelID == 3871 ||
m_dwModelID == 3883 || m_dwModelID == 3889 || m_dwModelID == 3974 || ( m_dwModelID >= 4542 && m_dwModelID <= 4549 ) ||
m_dwModelID == 5090 || m_dwModelID == 5104 || ( m_dwModelID >= 3136 && m_dwModelID <= 3166 ) ||
( m_dwModelID >= 3194 && m_dwModelID <= 3213 ) || ( m_dwModelID >= 3222 && m_dwModelID <= 3240 ) ||
( m_dwModelID >= 4763 && m_dwModelID <= 4805 ) || ( m_dwModelID >= 5376 && m_dwModelID <= 5389 )
);
}

BOOL CModelInfoSA::IsUpgrade ( void )
Expand Down
32 changes: 15 additions & 17 deletions MTA10/mods/shared_logic/CClientPlayerManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,23 +188,21 @@ bool CClientPlayerManager::IsPlayerLimitReached ( void )

bool CClientPlayerManager::IsValidModel ( unsigned long ulModel )
{
return ( ulModel == 0 ||
ulModel == 1 ||
ulModel == 2 ||
ulModel == 7 ||
ulModel >= 9 &&
ulModel != 208 &&
ulModel != 149 &&
ulModel != 119 &&
ulModel != 86 &&
ulModel != 74 &&
ulModel != 65 &&
ulModel != 42 &&
ulModel <= 272 ||
ulModel >= 274 &&
ulModel <= 288 ||
ulModel >= 290 &&
ulModel <= 312 );
return ( ( ulModel >= 0 && ulModel <= 312 ) || ulModel == 329 || ulModel == 340 || ulModel == 382 ||
ulModel == 383 || ulModel == 398 || ulModel == 399 || ( ulModel >= 612 && ulModel <= 614 ) ||
ulModel == 662 || ulModel == 663 || ( ulModel >= 665 && ulModel <= 699 ) ||
( ulModel >= 793 && ulModel <= 799 ) || ( ulModel >= 907 && ulModel <= 909 ) ||
ulModel == 965 || ulModel == 999 || ( ulModel >= 1194 && ulModel <= 1206 ) ||
ulModel == 1326 || ulModel == 1573 || ulModel == 1699 || ulModel == 2883 || ulModel == 2884 ||
( ulModel >= 3176 && ulModel <= 3197 ) || ( ulModel >= 3215 && ulModel <= 3220 ) ||
ulModel == 3245 || ulModel == 3247 || ulModel == 3248 || ulModel == 3251 || ulModel == 3254 ||
ulModel == 3266 || ulModel == 3348 || ulModel == 3349 || ulModel == 3416 || ulModel == 3429 ||
ulModel == 3610 || ulModel == 3611 || ulModel == 3784 || ulModel == 3870 || ulModel == 3871 ||
ulModel == 3883 || ulModel == 3889 || ulModel == 3974 || ( ulModel >= 4542 && ulModel <= 4549 ) ||
ulModel == 5090 || ulModel == 5104 || ( ulModel >= 3136 && ulModel <= 3166 ) ||
( ulModel >= 3194 && ulModel <= 3213 ) || ( ulModel >= 3222 && ulModel <= 3240 ) ||
( ulModel >= 4763 && ulModel <= 4805 ) || ( ulModel >= 5376 && ulModel <= 5389 )
);
}

void CClientPlayerManager::ResetAll ( void )
Expand Down
32 changes: 15 additions & 17 deletions MTA10_Server/mods/deathmatch/logic/CPlayerManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,23 +331,21 @@ void CPlayerManager::Broadcast ( const CPacket& Packet, const std::multimap < us

bool CPlayerManager::IsValidPlayerModel ( unsigned short usPlayerModel )
{
return ( usPlayerModel == 0 ||
usPlayerModel == 1 ||
usPlayerModel == 2 ||
usPlayerModel == 7 ||
(usPlayerModel >= 9 &&
usPlayerModel != 208 &&
usPlayerModel != 149 &&
usPlayerModel != 119 &&
usPlayerModel != 86 &&
usPlayerModel != 74 &&
usPlayerModel != 65 &&
usPlayerModel != 42 &&
usPlayerModel <= 272) ||
(usPlayerModel >= 274 &&
usPlayerModel <= 288) ||
(usPlayerModel >= 290 &&
usPlayerModel <= 312 ) );
return ( ( usPlayerModel >= 0 && usPlayerModel <= 312 ) || usPlayerModel == 329 || usPlayerModel == 340 || usPlayerModel == 382 ||
usPlayerModel == 383 || usPlayerModel == 398 || usPlayerModel == 399 || ( usPlayerModel >= 612 && usPlayerModel <= 614 ) ||
usPlayerModel == 662 || usPlayerModel == 663 || ( usPlayerModel >= 665 && usPlayerModel <= 699 ) ||
( usPlayerModel >= 793 && usPlayerModel <= 799 ) || ( usPlayerModel >= 907 && usPlayerModel <= 909 ) ||
usPlayerModel == 965 || usPlayerModel == 999 || ( usPlayerModel >= 1194 && usPlayerModel <= 1206 ) ||
usPlayerModel == 1326 || usPlayerModel == 1573 || usPlayerModel == 1699 || usPlayerModel == 2883 || usPlayerModel == 2884 ||
( usPlayerModel >= 3176 && usPlayerModel <= 3197 ) || ( usPlayerModel >= 3215 && usPlayerModel <= 3220 ) ||
usPlayerModel == 3245 || usPlayerModel == 3247 || usPlayerModel == 3248 || usPlayerModel == 3251 || usPlayerModel == 3254 ||
usPlayerModel == 3266 || usPlayerModel == 3348 || usPlayerModel == 3349 || usPlayerModel == 3416 || usPlayerModel == 3429 ||
usPlayerModel == 3610 || usPlayerModel == 3611 || usPlayerModel == 3784 || usPlayerModel == 3870 || usPlayerModel == 3871 ||
usPlayerModel == 3883 || usPlayerModel == 3889 || usPlayerModel == 3974 || ( usPlayerModel >= 4542 && usPlayerModel <= 4549 ) ||
usPlayerModel == 5090 || usPlayerModel == 5104 || ( usPlayerModel >= 3136 && usPlayerModel <= 3166 ) ||
( usPlayerModel >= 3194 && usPlayerModel <= 3213 ) || ( usPlayerModel >= 3222 && usPlayerModel <= 3240 ) ||
( usPlayerModel >= 4763 && usPlayerModel <= 4805 ) || ( usPlayerModel >= 5376 && usPlayerModel <= 5389 )
);
}


Expand Down