From fd07a2be14311c3693ba8f9cba27fc986ecee114 Mon Sep 17 00:00:00 2001 From: flowtron Date: Mon, 5 Jul 2010 18:35:16 +0000 Subject: [PATCH] fixing bugs 2913506 and 2913507 git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5284 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/editing.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/src/editing.cpp b/source/src/editing.cpp index b047914a..3f7be35e 100644 --- a/source/src/editing.cpp +++ b/source/src/editing.cpp @@ -50,8 +50,13 @@ void toggleedit(bool force) selset = false; editing = editmode ? 1 : 0; player1->state = editing ? CS_EDITING : CS_ALIVE; + if(editing && player1->onladder) player1->onladder = false; + if(editing && (player1->weaponsel->type == GUN_SNIPER && ((sniperrifle *)player1->weaponsel)->scoped)) + { + ((sniperrifle *)player1->weaponsel)->onownerdies(); // or ondeselecting() + addmsg(SV_SCOPE, "ri2", lastmillis, 0); + } if(!force) addmsg(SV_EDITMODE, "ri", editing); - // TODO (flowtron): if(editing && !_engine_knows_mappack_files_) get2knowMPfiles(); // MediaPack } void edittoggle() { toggleedit(false); }