Skip to content

Commit

Permalink
itemhandler - reinstated old skin behavior - new way may cause issues…
Browse files Browse the repository at this point in the history
… - further testing after release required
  • Loading branch information
1337Smithy committed Dec 21, 2020
1 parent 198c1e4 commit 1f10b99
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions coop_mod/itemhandler.scr
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,7 @@ takeUniformFromPlayer local.player:{
//=========================================================================
if(level.cMTE_coop_itemhandler){if(!level.cMTE){level.cMTE=0}; level.cMTE++; println( "-#-#- thread itemhandler/takeUniformFromPlayer->"+level.cMTE+"" )} //[202] chrissstrahl - this is to debug the coop mod thread handling

/*
if (local.player.flags["coop_hasEnemyUniform"]){
if (local.player.flags["coop_alliedUniform"]){
local.uniform = local.player.flags["coop_alliedUniform"]
Expand All @@ -778,14 +779,15 @@ if(level.cMTE_coop_itemhandler){if(!level.cMTE){level.cMTE=0}; level.cMTE++; pri
local.uniform = waitthread getPlayerUniform local.player
local.player stufftext ("dm_playermodel " + local.uniform)
}
*/

if (waitthread playHasEnemyUniform local.player local.uniform){ //set a default uniform if they somehow manage to have an exis one.
println "PLAYER HAS ENEMY UNIFORM - NOT ALLOWED!"
//if (waitthread playHasEnemyUniform local.player local.uniform){ //set a default uniform if they somehow manage to have an exis one.
// println "PLAYER HAS ENEMY UNIFORM - NOT ALLOWED!"
local.uniform = "american_army"
local.model = "models/player/american_army.tik"
local.player stufftext ("dm_playermodel " + local.uniform)
local.player.model = local.model
}
//}
}end

//[202] Smithy
Expand All @@ -807,11 +809,13 @@ if(level.cMTE_coop_itemhandler){if(!level.cMTE){level.cMTE=0}; level.cMTE++; pri
}

//[202] Smithy
/*
local.player.flags["coop_hasEnemyUniform"] = game.true
if (!local.player.flags["coop_alliedUniform"]){
local.player.flags["coop_alliedModel"] = local.player.model
local.player.flags["coop_alliedUniform"] = waitthread getPlayerUniform local.player
}
*/

local.player stufftext ("dm_playermodel " + local.uniform)
local.player.model = ("models/player/" + local.uniform + ".tik")
Expand Down

0 comments on commit 1f10b99

Please sign in to comment.