matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jacksonmj's decorations commit

Browse Source
This commit is contained in:
Simon Robertshaw 2011-05-24 14:57:46 +01:00
parent 453c69d39a
commit 2d9e0b75e4
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.c
View File

@ -2022,6 +2022,7 @@ int main(int argc, char *argv[])
{
if (sdl_mod & KMOD_CTRL)
{
<<<<<<< HEAD
decorations_enable = !decorations_enable;
itc = 51;
if (decorations_enable) strcpy(itc_msg, "Decorations layer: On");
@ -2033,6 +2034,19 @@ int main(int argc, char *argv[])
decorations_enable = 1;
sys_pause=1;
}
=======
decorations_enable = !decorations_enable;
itc = 51;
if (decorations_enable) strcpy(itc_msg, "Decorations layer: On");
else strcpy(itc_msg, "Decorations layer: Off");
}
else
{
decorations_ui(vid_buf,decorations,&bsx,&bsy);//decoration_mode = !decoration_mode;
decorations_enable = 1;
sys_pause=1;
}
>>>>>>> fb9f01d... jacksonmj's decoration commit
}
if (sdl_key=='g')
{