summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2011-01-17 01:54:41 (GMT)
committer Cracker64 <cracker642@gmail.com>2011-01-17 01:54:41 (GMT)
commit926450a9a3db03d0abd1afcff4ea0269415c0ced (patch)
treeaa6bbb0297f93f314dbe3c943490937363e8f5f8 /src
parentdb5bb618c171fe016d507307fe9774b12939ac49 (diff)
downloadpowder-926450a9a3db03d0abd1afcff4ea0269415c0ced.zip
powder-926450a9a3db03d0abd1afcff4ea0269415c0ced.tar.gz
more life types using states, put them in new menu. Maybe get some way to switch to new menu on mouseover of last spot of current life menu
Diffstat (limited to 'src')
-rw-r--r--src/graphics.c18
-rw-r--r--src/main.c2
2 files changed, 17 insertions, 3 deletions
diff --git a/src/graphics.c b/src/graphics.c
index 824cee8..ffaa333 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1726,9 +1726,9 @@ void draw_parts(pixel *vid)
else if(t==PT_TEST2)
{
if(parts[i].tmp==2)
- blendpixel(vid, nx, ny, 0, 100, 0, 255);
+ blendpixel(vid, nx, ny, 0, 100, 50, 255);
else
- blendpixel(vid, nx, ny, 0, 255, 0, 255);
+ blendpixel(vid, nx, ny, 0, 255, 90, 255);
}
else if(t==PT_TEST3)
{
@@ -1743,6 +1743,20 @@ void draw_parts(pixel *vid)
else
blendpixel(vid, nx, ny, 0, 0, 70, 255);
}
+ else if(t==PT_FROG)
+ {
+ if(parts[i].tmp==2)
+ blendpixel(vid, nx, ny, 0, 100, 0, 255);
+ else
+ blendpixel(vid, nx, ny, 0, 255, 0, 255);
+ }
+ else if(t==PT_BRAN)
+ {
+ if(parts[i].tmp==1)
+ blendpixel(vid, nx, ny, 150, 150, 0, 255);
+ else
+ blendpixel(vid, nx, ny, 255, 255, 0, 255);
+ }
else if(t==PT_DEUT)
{
diff --git a/src/main.c b/src/main.c
index 8ff3329..6308178 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1522,7 +1522,7 @@ int main(int argc, char *argv[])
}
}
if((sdl_mod & (KMOD_RCTRL) )&&( sdl_mod & (KMOD_RALT)))
- active_menu = 11;
+ active_menu = 12;
if(sdl_key==SDLK_INSERT || sdl_key==SDLK_BACKQUOTE)
REPLACE_MODE = !REPLACE_MODE;
if(sdl_key=='g')