mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

Merge pull request #126 from FredrIQ/master

Browse source 
Fix and improve handling of cancelling roomtext/scripttext input
This commit is contained in:
Terry Cavanagh 2020-01-30 15:36:18 +01:00 committed by GitHub
commit 98151b4c2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
desktop_version/src/editor.cpp
View file

@ -260,7 +260,7 @@ void editorclass::reset()
boundy2=0; boundy2=0;
scripttextmod=false; scripttextmod=false;
scripttextent=0; textent=0;
scripttexttype=0; scripttexttype=0;
drawmode=0; drawmode=0;
@ -289,7 +289,6 @@ void editorclass::reset()
levmusic=0; levmusic=0;
roomtextmod=false; roomtextmod=false;
roomtextent=0;
for (int j = 0; j < maxheight; j++) for (int j = 0; j < maxheight; j++)
{ {
@ -3168,11 +3167,11 @@ void editorrender( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, ent
dwgfx.Print(4, 224, "Enter script id name:", 255,255,255, false); dwgfx.Print(4, 224, "Enter script id name:", 255,255,255, false);
if(ed.entframe<2) if(ed.entframe<2)
{ {
dwgfx.Print(4, 232, edentity[ed.scripttextent].scriptname+"_", 196, 196, 255 - help.glow, true); dwgfx.Print(4, 232, edentity[ed.textent].scriptname+"_", 196, 196, 255 - help.glow, true);
} }
else else
{ {
dwgfx.Print(4, 232, edentity[ed.scripttextent].scriptname+" ", 196, 196, 255 - help.glow, true); dwgfx.Print(4, 232, edentity[ed.textent].scriptname+" ", 196, 196, 255 - help.glow, true);
} }
} }
else if(ed.savemod) else if(ed.savemod)
@ -3224,11 +3223,11 @@ void editorrender( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, ent
dwgfx.Print(4, 224, "Enter text string:", 255,255,255, false); dwgfx.Print(4, 224, "Enter text string:", 255,255,255, false);
if(ed.entframe<2) if(ed.entframe<2)
{ {
dwgfx.Print(4, 232, edentity[ed.roomtextent].scriptname+"_", 196, 196, 255 - help.glow, true); dwgfx.Print(4, 232, edentity[ed.textent].scriptname+"_", 196, 196, 255 - help.glow, true);
} }
else else
{ {
dwgfx.Print(4, 232, edentity[ed.roomtextent].scriptname+" ", 196, 196, 255 - help.glow, true); dwgfx.Print(4, 232, edentity[ed.textent].scriptname+" ", 196, 196, 255 - help.glow, true);
} }
} }
else if(ed.warpmod) else if(ed.warpmod)
@ -3685,12 +3684,20 @@ void editorinput( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, enti
ed.desc3mod=false; ed.desc3mod=false;
ed.websitemod=false; ed.websitemod=false;
ed.creatormod=false; ed.creatormod=false;
if(ed.scripttextmod) if(ed.scripttextmod || ed.roomtextmod)
{ {
ed.scripttextmod=false; if (ed.oldenttext == "")
removeedentity(ed.scripttextmod); {
removeedentity(ed.textent);
}
else
{
edentity[ed.textent].scriptname = ed.oldenttext;
}
} }
ed.scripttextmod=false;
ed.roomtextmod=false;
ed.shiftmenu=false; ed.shiftmenu=false;
ed.shiftkey=false; ed.shiftkey=false;
} }
@ -3927,11 +3934,11 @@ void editorinput( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, enti
} }
else if(ed.roomtextmod) else if(ed.roomtextmod)
{ {
edentity[ed.roomtextent].scriptname=key.keybuffer; edentity[ed.textent].scriptname=key.keybuffer;
} }
else if(ed.scripttextmod) else if(ed.scripttextmod)
{ {
edentity[ed.scripttextent].scriptname=key.keybuffer; edentity[ed.textent].scriptname=key.keybuffer;
} }
else if(ed.titlemod) else if(ed.titlemod)
{ {
@ -3999,7 +4006,7 @@ void editorinput( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, enti
} }
else if(ed.roomtextmod) else if(ed.roomtextmod)
{ {
edentity[ed.roomtextent].scriptname=key.keybuffer; edentity[ed.textent].scriptname=key.keybuffer;
ed.roomtextmod=false; ed.roomtextmod=false;
ed.shiftmenu=false; ed.shiftmenu=false;
@ -4007,12 +4014,12 @@ void editorinput( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, enti
} }
else if(ed.scripttextmod) else if(ed.scripttextmod)
{ {
edentity[ed.scripttextent].scriptname=key.keybuffer; edentity[ed.textent].scriptname=key.keybuffer;
ed.scripttextmod=false; ed.scripttextmod=false;
ed.clearscriptbuffer(); ed.clearscriptbuffer();
if(!ed.checkhook(edentity[ed.scripttextent].scriptname)) if(!ed.checkhook(edentity[ed.textent].scriptname))
{ {
ed.addhook(edentity[ed.scripttextent].scriptname); ed.addhook(edentity[ed.textent].scriptname);
} }
} }
else if(ed.titlemod) else if(ed.titlemod)
@ -4790,7 +4797,8 @@ void editorinput( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, enti
{ {
//Script trigger //Script trigger
ed.scripttextmod=true; ed.scripttextmod=true;
ed.scripttextent=EditorData::GetInstance().numedentities; ed.oldenttext="";
ed.textent=EditorData::GetInstance().numedentities;
addedentity((ed.boundx1/8)+(ed.levx*40),(ed.boundy1/8)+ (ed.levy*30),19, addedentity((ed.boundx1/8)+(ed.levx*40),(ed.boundy1/8)+ (ed.levy*30),19,
(ed.boundx2-ed.boundx1)/8, (ed.boundy2-ed.boundy1)/8); (ed.boundx2-ed.boundx1)/8, (ed.boundy2-ed.boundy1)/8);
ed.lclickdelay=1; ed.lclickdelay=1;
@ -4972,7 +4980,8 @@ void editorinput( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, enti
if(ed.drawmode==10) if(ed.drawmode==10)
{ {
ed.roomtextmod=true; ed.roomtextmod=true;
ed.roomtextent=EditorData::GetInstance().numedentities; ed.oldenttext="";
ed.textent=EditorData::GetInstance().numedentities;
ed.textentry=true; ed.textentry=true;
key.enabletextentry(); key.enabletextentry();
key.keybuffer=""; key.keybuffer="";
@ -5038,7 +5047,8 @@ void editorinput( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, enti
else if(ed.drawmode==11) else if(ed.drawmode==11)
{ {
ed.scripttextmod=true; ed.scripttextmod=true;
ed.scripttextent=EditorData::GetInstance().numedentities; ed.oldenttext="";
ed.textent=EditorData::GetInstance().numedentities;
ed.textentry=true; ed.textentry=true;
key.enabletextentry(); key.enabletextentry();
@ -5156,19 +5166,21 @@ void editorinput( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, enti
else if(edentity[tmp].t==17) else if(edentity[tmp].t==17)
{ {
ed.roomtextmod=true; ed.roomtextmod=true;
ed.roomtextent=tmp; ed.oldenttext=edentity[tmp].scriptname;
ed.textent=tmp;
ed.textentry=true; ed.textentry=true;
key.enabletextentry(); key.enabletextentry();
key.keybuffer=edentity[tmp].scriptname; key.keybuffer=ed.oldenttext;
ed.lclickdelay=1; ed.lclickdelay=1;
} }
else if(edentity[tmp].t==18) else if(edentity[tmp].t==18)
{ {
ed.scripttextmod=true; ed.scripttextmod=true;
ed.scripttextent=tmp; ed.oldenttext=edentity[tmp].scriptname;
ed.textent=tmp;
ed.textentry=true; ed.textentry=true;
key.enabletextentry(); key.enabletextentry();
key.keybuffer=edentity[tmp].scriptname; key.keybuffer=ed.oldenttext;
ed.lclickdelay=1; ed.lclickdelay=1;
} }
} }

4
desktop_version/src/editor.h
View file

@ -173,11 +173,11 @@ class editorclass{
int entframe, entframedelay; int entframe, entframedelay;
bool roomtextmod; bool roomtextmod;
int roomtextent;
bool scripttextmod; bool scripttextmod;
int scripttextent; int textent;
int scripttexttype; int scripttexttype;
std::string oldenttext;
bool xmod, zmod, spacemod, warpmod, roomnamemod, textentry, savemod, loadmod; bool xmod, zmod, spacemod, warpmod, roomnamemod, textentry, savemod, loadmod;
bool titlemod, creatormod, desc1mod, desc2mod, desc3mod, websitemod; bool titlemod, creatormod, desc1mod, desc2mod, desc3mod, websitemod;