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 #115 from FredrIQ/master

Browse source 
Make the level editor use font outlines
This commit is contained in:
Terry Cavanagh 2020-01-23 14:59:53 +01:00 committed by GitHub
commit 782ce95d11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
desktop_version/CONTRIBUTORS.txt
View file

@ -9,6 +9,7 @@ Contributors
* Dav999 (Dav999-v) * Dav999 (Dav999-v)
* Allison Fleischer (AllisonFleischer) * Allison Fleischer (AllisonFleischer)
* Daniel Lee (@ddm999) * Daniel Lee (@ddm999)
* Fredrik Ljungdahl (@FredrIQ)
* Elliott Saltar (@eboyblue3) * Elliott Saltar (@eboyblue3)
* Marvin Scholz (@ePirat) * Marvin Scholz (@ePirat)
* Keith Stellyes (@keithstellyes) * Keith Stellyes (@keithstellyes)

106
desktop_version/src/editor.cpp
View file

@ -2596,12 +2596,12 @@ void editorrender( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, ent
fillboxabs(dwgfx, (edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),16,16,dwgfx.getRGB(164,164,255)); fillboxabs(dwgfx, (edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),16,16,dwgfx.getRGB(164,164,255));
if(ed.temp==i) if(ed.temp==i)
{ {
dwgfx.Print((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)-8, dwgfx.bprint((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)-8,
"("+help.String(((edentity[i].p1-int(edentity[i].p1%40))/40)+1)+","+help.String(((edentity[i].p2-int(edentity[i].p2%30))/30)+1)+")",210,210,255); "("+help.String(((edentity[i].p1-int(edentity[i].p1%40))/40)+1)+","+help.String(((edentity[i].p2-int(edentity[i].p2%30))/30)+1)+")",210,210,255);
} }
else else
{ {
dwgfx.Print((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)-8,help.String(ed.findwarptoken(i)),210,210,255); dwgfx.bprint((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)-8,help.String(ed.findwarptoken(i)),210,210,255);
} }
break; break;
case 15: //Crewmates case 15: //Crewmates
@ -2620,11 +2620,11 @@ void editorrender( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, ent
fillboxabs(dwgfx, (edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),16,24,dwgfx.getRGB(164,255,255)); fillboxabs(dwgfx, (edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),16,24,dwgfx.getRGB(164,255,255));
if(ed.entframe<2) if(ed.entframe<2)
{ {
dwgfx.Print((edentity[i].x*8)- (ed.levx*40*8)-12,(edentity[i].y*8)- (ed.levy*30*8)-8,"START",255,255,255); dwgfx.bprint((edentity[i].x*8)- (ed.levx*40*8)-12,(edentity[i].y*8)- (ed.levy*30*8)-8,"START",255,255,255);
} }
else else
{ {
dwgfx.Print((edentity[i].x*8)- (ed.levx*40*8)-12,(edentity[i].y*8)- (ed.levy*30*8)-8,"START",196,196,196); dwgfx.bprint((edentity[i].x*8)- (ed.levx*40*8)-12,(edentity[i].y*8)- (ed.levy*30*8)-8,"START",196,196,196);
} }
break; break;
case 17: //Roomtext case 17: //Roomtext
@ -2636,14 +2636,14 @@ void editorrender( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, ent
{ {
fillboxabs(dwgfx, (edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),edentity[i].scriptname.length()*8,8,dwgfx.getRGB(96,96,96)); fillboxabs(dwgfx, (edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),edentity[i].scriptname.length()*8,8,dwgfx.getRGB(96,96,96));
} }
dwgfx.Print((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8), edentity[i].scriptname, 196, 196, 255 - help.glow); dwgfx.bprint((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8), edentity[i].scriptname, 196, 196, 255 - help.glow);
break; break;
case 18: //Terminals case 18: //Terminals
dwgfx.drawsprite((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)+8,17,96,96,96); dwgfx.drawsprite((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)+8,17,96,96,96);
fillboxabs(dwgfx, (edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),16,24,dwgfx.getRGB(164,164,164)); fillboxabs(dwgfx, (edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),16,24,dwgfx.getRGB(164,164,164));
if(ed.temp==i) if(ed.temp==i)
{ {
dwgfx.Print((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)-8,edentity[i].scriptname,210,210,255); dwgfx.bprint((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)-8,edentity[i].scriptname,210,210,255);
} }
break; break;
case 19: //Script Triggers case 19: //Script Triggers
@ -2651,7 +2651,7 @@ void editorrender( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, ent
fillboxabs(dwgfx, (edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),8,8,dwgfx.getRGB(255,255,255)); fillboxabs(dwgfx, (edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),8,8,dwgfx.getRGB(255,255,255));
if(ed.temp==i) if(ed.temp==i)
{ {
dwgfx.Print((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)-8,edentity[i].scriptname,210,210,255); dwgfx.bprint((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)-8,edentity[i].scriptname,210,210,255);
} }
break; break;
case 50: //Warp lines case 50: //Warp lines
@ -2696,12 +2696,12 @@ void editorrender( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, ent
fillboxabs(dwgfx, (edentity[i].p1*8)- (ed.levx*40*8),(edentity[i].p2*8)- (ed.levy*30*8),16,16,dwgfx.getRGB(64,64,96)); fillboxabs(dwgfx, (edentity[i].p1*8)- (ed.levx*40*8),(edentity[i].p2*8)- (ed.levy*30*8),16,16,dwgfx.getRGB(64,64,96));
if(ed.tilex+(ed.levx*40)==edentity[i].p1 && ed.tiley+(ed.levy*30)==edentity[i].p2) if(ed.tilex+(ed.levx*40)==edentity[i].p1 && ed.tiley+(ed.levy*30)==edentity[i].p2)
{ {
dwgfx.Print((edentity[i].p1*8)- (ed.levx*40*8),(edentity[i].p2*8)- (ed.levy*30*8)-8, dwgfx.bprint((edentity[i].p1*8)- (ed.levx*40*8),(edentity[i].p2*8)- (ed.levy*30*8)-8,
"("+help.String(((edentity[i].x-int(edentity[i].x%40))/40)+1)+","+help.String(((edentity[i].y-int(edentity[i].y%30))/30)+1)+")",190,190,225); "("+help.String(((edentity[i].x-int(edentity[i].x%40))/40)+1)+","+help.String(((edentity[i].y-int(edentity[i].y%30))/30)+1)+")",190,190,225);
} }
else else
{ {
dwgfx.Print((edentity[i].p1*8)- (ed.levx*40*8),(edentity[i].p2*8)- (ed.levy*30*8)-8,help.String(ed.findwarptoken(i)),190,190,225); dwgfx.bprint((edentity[i].p1*8)- (ed.levx*40*8),(edentity[i].p2*8)- (ed.levy*30*8)-8,help.String(ed.findwarptoken(i)),190,190,225);
} }
} }
} }
@ -2852,8 +2852,8 @@ void editorrender( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, ent
if(ed.dmtileeditor>0 && t2<=30) if(ed.dmtileeditor>0 && t2<=30)
{ {
dwgfx.Print(2, 45-t2, "Tile:", 196, 196, 255 - help.glow, false); dwgfx.bprint(2, 45-t2, "Tile:", 196, 196, 255 - help.glow, false);
dwgfx.Print(58, 45-t2, help.String(ed.dmtile), 196, 196, 255 - help.glow, false); dwgfx.bprint(58, 45-t2, help.String(ed.dmtile), 196, 196, 255 - help.glow, false);
FillRect(dwgfx.backBuffer, 44,44-t2,10,10, dwgfx.getRGB(196, 196, 255 - help.glow)); FillRect(dwgfx.backBuffer, 44,44-t2,10,10, dwgfx.getRGB(196, 196, 255 - help.glow));
FillRect(dwgfx.backBuffer, 45,45-t2,8,8, dwgfx.getRGB(0,0,0)); FillRect(dwgfx.backBuffer, 45,45-t2,8,8, dwgfx.getRGB(0,0,0));
@ -2868,8 +2868,8 @@ void editorrender( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, ent
} }
else else
{ {
dwgfx.Print(2, 12, "Tile:", 196, 196, 255 - help.glow, false); dwgfx.bprint(2, 12, "Tile:", 196, 196, 255 - help.glow, false);
dwgfx.Print(58, 12, help.String(ed.dmtile), 196, 196, 255 - help.glow, false); dwgfx.bprint(58, 12, help.String(ed.dmtile), 196, 196, 255 - help.glow, false);
FillRect(dwgfx.backBuffer, 44,11,10,10, dwgfx.getRGB(196, 196, 255 - help.glow)); FillRect(dwgfx.backBuffer, 44,11,10,10, dwgfx.getRGB(196, 196, 255 - help.glow));
FillRect(dwgfx.backBuffer, 45,12,8,8, dwgfx.getRGB(0,0,0)); FillRect(dwgfx.backBuffer, 45,12,8,8, dwgfx.getRGB(0,0,0));
@ -3387,61 +3387,61 @@ void editorrender( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, ent
switch(ed.drawmode) switch(ed.drawmode)
{ {
case 0: case 0:
dwgfx.Print(2,199, "1: Walls",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "1: Walls",196, 196, 255 - help.glow);
break; break;
case 1: case 1:
dwgfx.Print(2,199, "2: Backing",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "2: Backing",196, 196, 255 - help.glow);
break; break;
case 2: case 2:
dwgfx.Print(2,199, "3: Spikes",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "3: Spikes",196, 196, 255 - help.glow);
break; break;
case 3: case 3:
dwgfx.Print(2,199, "4: Trinkets",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "4: Trinkets",196, 196, 255 - help.glow);
break; break;
case 4: case 4:
dwgfx.Print(2,199, "5: Checkpoint",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "5: Checkpoint",196, 196, 255 - help.glow);
break; break;
case 5: case 5:
dwgfx.Print(2,199, "6: Disappear",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "6: Disappear",196, 196, 255 - help.glow);
break; break;
case 6: case 6:
dwgfx.Print(2,199, "7: Conveyors",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "7: Conveyors",196, 196, 255 - help.glow);
break; break;
case 7: case 7:
dwgfx.Print(2,199, "8: Moving",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "8: Moving",196, 196, 255 - help.glow);
break; break;
case 8: case 8:
dwgfx.Print(2,199, "9: Enemies",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "9: Enemies",196, 196, 255 - help.glow);
break; break;
case 9: case 9:
dwgfx.Print(2,199, "0: Grav Line",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "0: Grav Line",196, 196, 255 - help.glow);
break; break;
case 10: case 10:
dwgfx.Print(2,199, "R: Roomtext",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "R: Roomtext",196, 196, 255 - help.glow);
break; break;
case 11: case 11:
dwgfx.Print(2,199, "T: Terminal",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "T: Terminal",196, 196, 255 - help.glow);
break; break;
case 12: case 12:
dwgfx.Print(2,199, "Y: Script Box",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "Y: Script Box",196, 196, 255 - help.glow);
break; break;
case 13: case 13:
dwgfx.Print(2,199, "U: Warp Token",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "U: Warp Token",196, 196, 255 - help.glow);
break; break;
case 14: case 14:
dwgfx.Print(2,199, "I: Warp Lines",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "I: Warp Lines",196, 196, 255 - help.glow);
break; break;
case 15: case 15:
dwgfx.Print(2,199, "O: Crewmate",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "O: Crewmate",196, 196, 255 - help.glow);
break; break;
case 16: case 16:
dwgfx.Print(2,199, "P: Start Point",196, 196, 255 - help.glow); dwgfx.bprint(2,199, "P: Start Point",196, 196, 255 - help.glow);
break; break;
} }
FillRect(dwgfx.backBuffer, 260,198,80,10, dwgfx.getRGB(32,32,32)); FillRect(dwgfx.backBuffer, 260,198,80,10, dwgfx.getRGB(32,32,32));
FillRect(dwgfx.backBuffer, 261,199,80,9, dwgfx.getRGB(0,0,0)); FillRect(dwgfx.backBuffer, 261,199,80,9, dwgfx.getRGB(0,0,0));
dwgfx.Print(268,199, "("+help.String(ed.levx+1)+","+help.String(ed.levy+1)+")",196, 196, 255 - help.glow, false); dwgfx.bprint(268,199, "("+help.String(ed.levx+1)+","+help.String(ed.levy+1)+")",196, 196, 255 - help.glow, false);
} }
else else
@ -3462,13 +3462,13 @@ void editorrender( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, ent
FillRect(dwgfx.backBuffer, 0,230+ed.roomnamehide,320,10, dwgfx.getRGB(0,0,0)); FillRect(dwgfx.backBuffer, 0,230+ed.roomnamehide,320,10, dwgfx.getRGB(0,0,0));
dwgfx.Print(5,231+ed.roomnamehide,ed.level[ed.levx+(ed.maxwidth*ed.levy)].roomname, 196, 196, 255 - help.glow, true); dwgfx.Print(5,231+ed.roomnamehide,ed.level[ed.levx+(ed.maxwidth*ed.levy)].roomname, 196, 196, 255 - help.glow, true);
} }
dwgfx.Print(4, 222, "SPACE ^ SHIFT ^", 196, 196, 255 - help.glow, false); dwgfx.bprint(4, 222, "SPACE ^ SHIFT ^", 196, 196, 255 - help.glow, false);
dwgfx.Print(268,222, "("+help.String(ed.levx+1)+","+help.String(ed.levy+1)+")",196, 196, 255 - help.glow, false); dwgfx.bprint(268,222, "("+help.String(ed.levx+1)+","+help.String(ed.levy+1)+")",196, 196, 255 - help.glow, false);
} }
else else
{ {
dwgfx.Print(4, 232, "SPACE ^ SHIFT ^", 196, 196, 255 - help.glow, false); dwgfx.bprint(4, 232, "SPACE ^ SHIFT ^", 196, 196, 255 - help.glow, false);
dwgfx.Print(268,232, "("+help.String(ed.levx+1)+","+help.String(ed.levy+1)+")",196, 196, 255 - help.glow, false); dwgfx.bprint(268,232, "("+help.String(ed.levx+1)+","+help.String(ed.levy+1)+")",196, 196, 255 - help.glow, false);
} }
} }
@ -3501,55 +3501,55 @@ void editorrender( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, ent
switch(ed.drawmode) switch(ed.drawmode)
{ {
case 0: case 0:
dwgfx.Print(2,2, "1: Walls",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "1: Walls",196, 196, 255 - help.glow);
break; break;
case 1: case 1:
dwgfx.Print(2,2, "2: Backing",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "2: Backing",196, 196, 255 - help.glow);
break; break;
case 2: case 2:
dwgfx.Print(2,2, "3: Spikes",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "3: Spikes",196, 196, 255 - help.glow);
break; break;
case 3: case 3:
dwgfx.Print(2,2, "4: Trinkets",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "4: Trinkets",196, 196, 255 - help.glow);
break; break;
case 4: case 4:
dwgfx.Print(2,2, "5: Checkpoint",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "5: Checkpoint",196, 196, 255 - help.glow);
break; break;
case 5: case 5:
dwgfx.Print(2,2, "6: Disappear",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "6: Disappear",196, 196, 255 - help.glow);
break; break;
case 6: case 6:
dwgfx.Print(2,2, "7: Conveyors",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "7: Conveyors",196, 196, 255 - help.glow);
break; break;
case 7: case 7:
dwgfx.Print(2,2, "8: Moving",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "8: Moving",196, 196, 255 - help.glow);
break; break;
case 8: case 8:
dwgfx.Print(2,2, "9: Enemies",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "9: Enemies",196, 196, 255 - help.glow);
break; break;
case 9: case 9:
dwgfx.Print(2,2, "0: Grav Line",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "0: Grav Line",196, 196, 255 - help.glow);
break; break;
case 10: case 10:
dwgfx.Print(2,2, "R: Roomtext",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "R: Roomtext",196, 196, 255 - help.glow);
break; break;
case 11: case 11:
dwgfx.Print(2,2, "T: Terminal",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "T: Terminal",196, 196, 255 - help.glow);
break; break;
case 12: case 12:
dwgfx.Print(2,2, "Y: Script Box",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "Y: Script Box",196, 196, 255 - help.glow);
break; break;
case 13: case 13:
dwgfx.Print(2,2, "U: Warp Token",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "U: Warp Token",196, 196, 255 - help.glow);
break; break;
case 14: case 14:
dwgfx.Print(2,2, "I: Warp Lines",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "I: Warp Lines",196, 196, 255 - help.glow);
break; break;
case 15: case 15:
dwgfx.Print(2,2, "O: Crewmate",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "O: Crewmate",196, 196, 255 - help.glow);
break; break;
case 16: case 16:
dwgfx.Print(2,2, "P: Start Point",196, 196, 255 - help.glow); dwgfx.bprint(2,2, "P: Start Point",196, 196, 255 - help.glow);
break; break;
} }
@ -3577,7 +3577,7 @@ void editorrender( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, ent
if (game.test) if (game.test)
{ {
dwgfx.Print(5, 5, game.teststring, 196, 196, 255 - help.glow, false); dwgfx.bprint(5, 5, game.teststring, 196, 196, 255 - help.glow, false);
} }
dwgfx.drawfade(); dwgfx.drawfade();