summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaldfir2012-04-05 17:37:29 -0700
committerCaldfir2012-04-05 17:37:29 -0700
commitf0518d6835a332acb5807e5c7a7eac468031e218 (patch)
tree88ea12a144464ed8a7b591020c212f40d86ebdb8
parent178e360ca193f8d6886287046c9f7d3991f4dcd3 (diff)
downloadstonesense-f0518d6835a332acb5807e5c7a7eac468031e218.tar.gz
stonesense-f0518d6835a332acb5807e5c7a7eac468031e218.tar.bz2
stonesense-f0518d6835a332acb5807e5c7a7eac468031e218.tar.xz
Renamed erroneously named 'job' variables to correctly read 'profession'.
-rw-r--r--Creatures.cpp4
-rw-r--r--GUI.cpp10
-rw-r--r--GUI.h2
-rw-r--r--UserInput.cpp4
-rw-r--r--commonTypes.h2
-rw-r--r--resources/SSJobIcons.pngbin8217 -> 0 bytes
6 files changed, 11 insertions, 11 deletions
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
--- a/resources/SSJobIcons.png
+++ /dev/null
Binary files differ