mirror of
				https://github.com/KartKrewDev/RingRacers.git
				synced 2025-10-30 08:01:28 +00:00 
			
		
		
		
	Merge public master
This commit is contained in:
		
						commit
						3d5639c864
					
				
					 3 changed files with 28 additions and 0 deletions
				
			
		|  | @ -1654,6 +1654,32 @@ bool CallFunc_PlayerSkin(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM:: | ||||||
| 	return false; | 	return false; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | /*--------------------------------------------------
 | ||||||
|  | 	bool CallFunc_PlayerSkinRealName(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC) | ||||||
|  | 
 | ||||||
|  | 		Returns the activating player's skin real name. | ||||||
|  | --------------------------------------------------*/ | ||||||
|  | bool CallFunc_PlayerSkinRealName(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC) | ||||||
|  | { | ||||||
|  | 	Environment *env = &ACSEnv; | ||||||
|  | 	auto info = &static_cast<Thread *>(thread)->info; | ||||||
|  | 
 | ||||||
|  | 	(void)argV; | ||||||
|  | 	(void)argC; | ||||||
|  | 
 | ||||||
|  | 	if ((info != NULL) | ||||||
|  | 		&& (info->mo != NULL && P_MobjWasRemoved(info->mo) == false) | ||||||
|  | 		&& (info->mo->player != NULL)) | ||||||
|  | 	{ | ||||||
|  | 		UINT16 skin = info->mo->player->skin; | ||||||
|  | 		thread->dataStk.push(~env->getString( skins[skin]->realname )->idx); | ||||||
|  | 		return false; | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	thread->dataStk.push(0); | ||||||
|  | 	return false; | ||||||
|  | } | ||||||
|  | 
 | ||||||
| /*--------------------------------------------------
 | /*--------------------------------------------------
 | ||||||
| 	bool CallFunc_PlayerBot(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC) | 	bool CallFunc_PlayerBot(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -76,6 +76,7 @@ bool CallFunc_CountPushables(ACSVM::Thread *thread, const ACSVM::Word *argV, ACS | ||||||
| bool CallFunc_HaveUnlockableTrigger(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC); | bool CallFunc_HaveUnlockableTrigger(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC); | ||||||
| bool CallFunc_HaveUnlockable(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC); | bool CallFunc_HaveUnlockable(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC); | ||||||
| bool CallFunc_PlayerSkin(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC); | bool CallFunc_PlayerSkin(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC); | ||||||
|  | bool CallFunc_PlayerSkinRealName(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC); | ||||||
| bool CallFunc_PlayerBot(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC); | bool CallFunc_PlayerBot(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC); | ||||||
| bool CallFunc_PlayerLosing(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC); | bool CallFunc_PlayerLosing(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC); | ||||||
| bool CallFunc_PlayerExiting(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC); | bool CallFunc_PlayerExiting(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC); | ||||||
|  |  | ||||||
|  | @ -177,6 +177,7 @@ Environment::Environment() | ||||||
| 	addFuncDataACS0( 318, addCallFunc(CallFunc_CheckTutorialChallenge)); | 	addFuncDataACS0( 318, addCallFunc(CallFunc_CheckTutorialChallenge)); | ||||||
| 	addFuncDataACS0( 319, addCallFunc(CallFunc_PlayerLosing)); | 	addFuncDataACS0( 319, addCallFunc(CallFunc_PlayerLosing)); | ||||||
| 	addFuncDataACS0( 320, addCallFunc(CallFunc_PlayerExiting)); | 	addFuncDataACS0( 320, addCallFunc(CallFunc_PlayerExiting)); | ||||||
|  | 	addFuncDataACS0( 321, addCallFunc(CallFunc_PlayerSkinRealName)); | ||||||
| 
 | 
 | ||||||
| 	addFuncDataACS0( 500, addCallFunc(CallFunc_CameraWait)); | 	addFuncDataACS0( 500, addCallFunc(CallFunc_CameraWait)); | ||||||
| 	addFuncDataACS0( 501, addCallFunc(CallFunc_PodiumPosition)); | 	addFuncDataACS0( 501, addCallFunc(CallFunc_PodiumPosition)); | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Eidolon
						Eidolon