From df256cfc6a108536a871c8b6c8e8abcb2ced365d Mon Sep 17 00:00:00 2001 From: Caldfir Date: Sun, 1 Apr 2012 13:10:56 -0700 Subject: Made icons for military/misc professions. --- resources/SSJobIcons.png | Bin 8011 -> 8217 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/resources/SSJobIcons.png b/resources/SSJobIcons.png index 2bd0880..6cc5a64 100644 Binary files a/resources/SSJobIcons.png and b/resources/SSJobIcons.png differ -- cgit v1.2.1 From 6670eebffa523a53eeaffffe1fd037532285e51e Mon Sep 17 00:00:00 2001 From: Caldfir Date: Wed, 4 Apr 2012 23:51:46 -0700 Subject: Put back the semi-complete preofession indicators from my deleted fork. --- resources/SSJobIcons.png | Bin 8011 -> 8217 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/resources/SSJobIcons.png b/resources/SSJobIcons.png index 2bd0880..6cc5a64 100644 Binary files a/resources/SSJobIcons.png and b/resources/SSJobIcons.png differ -- cgit v1.2.1 From f0518d6835a332acb5807e5c7a7eac468031e218 Mon Sep 17 00:00:00 2001 From: Caldfir Date: Thu, 5 Apr 2012 17:37:29 -0700 Subject: Renamed erroneously named 'job' variables to correctly read 'profession'. --- Creatures.cpp | 4 ++-- GUI.cpp | 10 +++++----- GUI.h | 2 +- UserInput.cpp | 4 ++-- commonTypes.h | 2 +- resources/SSJobIcons.png | Bin 8217 -> 0 bytes 6 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 resources/SSJobIcons.png diff --git a/Creatures.cpp b/Creatures.cpp index ba19970..05f923b 100644 --- a/Creatures.cpp +++ b/Creatures.cpp @@ -290,11 +290,11 @@ void DrawCreature(int drawx, int drawy, t_unit* creature, Block * b){ offsety += config.show_creature_moods ? 16 : 0; - if(config.show_creature_jobs) + if(config.show_creature_professions) { unsigned int sheetx = 16 * (creature->profession % 7); unsigned int sheety = 16 * (creature->profession / 7); - al_draw_bitmap_region(IMGJobSheet, sheetx, sheety, 16, 16, drawx -8 + (SPRITEWIDTH*config.scale/2), drawy - (16 + WALLHEIGHT*config.scale + offsety), 0); + al_draw_bitmap_region(IMGProfSheet, sheetx, sheety, 16, 16, drawx -8 + (SPRITEWIDTH*config.scale/2), drawy - (16 + WALLHEIGHT*config.scale + offsety), 0); } } diff --git a/GUI.cpp b/GUI.cpp index 2dcf372..39da953 100644 --- a/GUI.cpp +++ b/GUI.cpp @@ -56,7 +56,7 @@ ALLEGRO_BITMAP* IMGObjectSheet; ALLEGRO_BITMAP* IMGCreatureSheet; ALLEGRO_BITMAP* IMGRampSheet; ALLEGRO_BITMAP* IMGStatusSheet; -ALLEGRO_BITMAP* IMGJobSheet; +ALLEGRO_BITMAP* IMGProfSheet; ALLEGRO_BITMAP* IMGBloodSheet; ALLEGRO_BITMAP* IMGEngFloorSheet; ALLEGRO_BITMAP* IMGEngLeftSheet; @@ -1047,7 +1047,7 @@ void loadGraphicsFromDisk() if(!load_from_path(p, "creatures.png", IMGCreatureSheet)) return; if(!load_from_path(p, "ramps.png", IMGRampSheet)) return; if(!load_from_path(p, "SSStatusIcons.png", IMGStatusSheet)) return; - if(!load_from_path(p, "SSJobIcons.png", IMGJobSheet)) return; + if(!load_from_path(p, "SSProfIcons.png", IMGProfSheet)) return; if(!load_from_path(p, "gibs.png", IMGBloodSheet)) return; if(!load_from_path(p, "engravings_floor.png", IMGEngFloorSheet)) return; if(!load_from_path(p, "engravings_left.png", IMGEngLeftSheet)) return; @@ -1082,10 +1082,10 @@ void flushImgFiles() al_destroy_bitmap(IMGStatusSheet); IMGStatusSheet = 0; } - if(IMGJobSheet) + if(IMGProfSheet) { - al_destroy_bitmap(IMGJobSheet); - IMGJobSheet = 0; + al_destroy_bitmap(IMGProfSheet); + IMGProfSheet = 0; } if(IMGEngFloorSheet) { diff --git a/GUI.h b/GUI.h index e531c4b..0769dd7 100644 --- a/GUI.h +++ b/GUI.h @@ -49,7 +49,7 @@ extern ALLEGRO_BITMAP* IMGObjectSheet; extern ALLEGRO_BITMAP* IMGCreatureSheet; extern ALLEGRO_BITMAP* IMGRampSheet; extern ALLEGRO_BITMAP* IMGStatusSheet; -extern ALLEGRO_BITMAP* IMGJobSheet; +extern ALLEGRO_BITMAP* IMGProfSheet; extern ALLEGRO_BITMAP* IMGBloodSheet; extern ALLEGRO_BITMAP* IMGEngFloorSheet; extern ALLEGRO_BITMAP* IMGEngLeftSheet; diff --git a/UserInput.cpp b/UserInput.cpp index 7f5f735..96c31fb 100644 --- a/UserInput.cpp +++ b/UserInput.cpp @@ -232,8 +232,8 @@ void doKeys(int Key) config.show_creature_moods = !config.show_creature_moods; timeToReloadSegment = true; } - if(Key == ALLEGRO_KEY_J){ - config.show_creature_jobs = !config.show_creature_jobs; + if(Key == ALLEGRO_KEY_P){ + config.show_creature_professions = !config.show_creature_professions; timeToReloadSegment = true; } if(Key == ALLEGRO_KEY_C){ diff --git a/commonTypes.h b/commonTypes.h index 1b804b1..40c7c7f 100644 --- a/commonTypes.h +++ b/commonTypes.h @@ -190,7 +190,7 @@ typedef struct bool dayNightCycle; bool show_creature_moods; - bool show_creature_jobs; + bool show_creature_professions; bool transparentScreenshots; diff --git a/resources/SSJobIcons.png b/resources/SSJobIcons.png deleted file mode 100644 index 6cc5a64..0000000 Binary files a/resources/SSJobIcons.png and /dev/null differ -- cgit v1.2.1 From f1b38ee217bdc2e562e9f1d9df0b1b89015d2346 Mon Sep 17 00:00:00 2001 From: Caldfir Date: Thu, 5 Apr 2012 19:40:37 -0700 Subject: Added preliminary version of clothed female dwarves. --- Creatures.cpp | 1 + resources/creatures/large_256/Thumbs.db | Bin 129536 -> 152064 bytes resources/creatures/large_256/dwarf.png | Bin 113517 -> 0 bytes resources/creatures/large_256/dwarf.xml | 115 ++++++++++++++++++++++++++++++- resources/creatures/large_256/dwarff.png | Bin 0 -> 86891 bytes resources/creatures/large_256/dwarfm.png | Bin 0 -> 118903 bytes 6 files changed, 113 insertions(+), 3 deletions(-) delete mode 100644 resources/creatures/large_256/dwarf.png create mode 100644 resources/creatures/large_256/dwarff.png create mode 100644 resources/creatures/large_256/dwarfm.png diff --git a/Creatures.cpp b/Creatures.cpp index 05f923b..64cf633 100644 --- a/Creatures.cpp +++ b/Creatures.cpp @@ -278,6 +278,7 @@ void DrawCreature(int drawx, int drawy, t_unit* creature, Block * b){ unsigned int offsety = config.show_creature_names ? al_get_font_line_height(font) : 0; sprite->draw_world(creature->x,creature->y, creature->z, b); + if(statusIcons.size()) { for(int i = 0; i < statusIcons.size(); i++) diff --git a/resources/creatures/large_256/Thumbs.db b/resources/creatures/large_256/Thumbs.db index 8f566ae..8d32ab2 100644 Binary files a/resources/creatures/large_256/Thumbs.db and b/resources/creatures/large_256/Thumbs.db differ diff --git a/resources/creatures/large_256/dwarf.png b/resources/creatures/large_256/dwarf.png deleted file mode 100644 index bd906ee..0000000 Binary files a/resources/creatures/large_256/dwarf.png and /dev/null differ diff --git a/resources/creatures/large_256/dwarf.xml b/resources/creatures/large_256/dwarf.xml index 8d5c892..367bdf7 100644 --- a/resources/creatures/large_256/dwarf.xml +++ b/resources/creatures/large_256/dwarf.xml @@ -1,8 +1,8 @@ - + - + @@ -57,7 +57,116 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/creatures/large_256/dwarff.png b/resources/creatures/large_256/dwarff.png new file mode 100644 index 0000000..72059c3 Binary files /dev/null and b/resources/creatures/large_256/dwarff.png differ diff --git a/resources/creatures/large_256/dwarfm.png b/resources/creatures/large_256/dwarfm.png new file mode 100644 index 0000000..495dcbe Binary files /dev/null and b/resources/creatures/large_256/dwarfm.png differ -- cgit v1.2.1 From 667ae8fb75b6d44b112abadc08b290d7c1ded10b Mon Sep 17 00:00:00 2001 From: Caldfir Date: Tue, 10 Apr 2012 09:25:26 -0700 Subject: Finished the new female dwarven clothes sprites! (finally) --- resources/creatures/large_256/Thumbs.db | Bin 152064 -> 163840 bytes resources/creatures/large_256/dwarf.xml | 2 +- resources/creatures/large_256/dwarff.png | Bin 86891 -> 245784 bytes resources/creatures/large_256/dwarfm.png | Bin 118903 -> 121063 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/creatures/large_256/Thumbs.db b/resources/creatures/large_256/Thumbs.db index 8d32ab2..5822522 100644 Binary files a/resources/creatures/large_256/Thumbs.db and b/resources/creatures/large_256/Thumbs.db differ diff --git a/resources/creatures/large_256/dwarf.xml b/resources/creatures/large_256/dwarf.xml index 367bdf7..ae360ef 100644 --- a/resources/creatures/large_256/dwarf.xml +++ b/resources/creatures/large_256/dwarf.xml @@ -57,7 +57,7 @@ - + diff --git a/resources/creatures/large_256/dwarff.png b/resources/creatures/large_256/dwarff.png index 72059c3..1a856d9 100644 Binary files a/resources/creatures/large_256/dwarff.png and b/resources/creatures/large_256/dwarff.png differ diff --git a/resources/creatures/large_256/dwarfm.png b/resources/creatures/large_256/dwarfm.png index 495dcbe..7fa586e 100644 Binary files a/resources/creatures/large_256/dwarfm.png and b/resources/creatures/large_256/dwarfm.png differ -- cgit v1.2.1