Skip to content

Commit 93e121f

Browse files
ccw808ccw808
committed
Merge pull request #17 from ArranTuna/master
[For testing] #7935: Patch: More ped skin IDs (Improved)
2 parents 79d1e87 + d800886 commit 93e121f

File tree

4 files changed

+68
-51
lines changed

4 files changed

+68
-51
lines changed

‎MTA10/game_sa/CGameSA.cpp‎

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

724747
// Well, has it?

‎MTA10/game_sa/CModelInfoSA.cpp‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -256,23 +256,21 @@ BOOL CModelInfoSA::IsVehicle ( )
256256

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

278276
BOOL CModelInfoSA::IsUpgrade ( void )

‎MTA10/mods/shared_logic/CClientPlayerManager.cpp‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -188,23 +188,21 @@ bool CClientPlayerManager::IsPlayerLimitReached ( void )
188188

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

210208
void CClientPlayerManager::ResetAll ( void )

‎MTA10_Server/mods/deathmatch/logic/CPlayerManager.cpp‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -331,23 +331,21 @@ void CPlayerManager::Broadcast ( const CPacket& Packet, const std::multimap < us
331331

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

353351

0 commit comments

Comments
 (0)