summaryrefslogtreecommitdiff
path: root/Creatures.cpp
diff options
context:
space:
mode:
authorJapa2010-07-18 19:23:05 +0000
committerJapa2010-07-18 19:23:05 +0000
commit2fc5d2f220a5c841bd7f84b860bfd20782d43abe (patch)
tree0bf0e3c8e5601daaba79c39df17e5d13a690e82b /Creatures.cpp
parent910620453473215b191ecdc5c1d8bff350dd4037 (diff)
downloadstonesense-2fc5d2f220a5c841bd7f84b860bfd20782d43abe.tar.gz
stonesense-2fc5d2f220a5c841bd7f84b860bfd20782d43abe.tar.bz2
stonesense-2fc5d2f220a5c841bd7f84b860bfd20782d43abe.tar.xz
Updated Allegro to version 4.9.21
Diffstat (limited to 'Creatures.cpp')
-rw-r--r--Creatures.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/Creatures.cpp b/Creatures.cpp
index f8e1dd6..f6e7a27 100644
--- a/Creatures.cpp
+++ b/Creatures.cpp
@@ -224,10 +224,6 @@ bool IsCreatureVisible( t_creature* c ){
}
void DrawCreature(int drawx, int drawy, t_creature* creature ){
- int op, src, dst, alpha_op, alpha_src, alpha_dst;
- ALLEGRO_COLOR color;
- al_get_separate_blender(&op, &src, &dst, &alpha_op, &alpha_src, &alpha_dst, &color);
-
vector<int> statusIcons;
//if(config.show_creature_happiness)
@@ -288,7 +284,7 @@ void DrawCreatureText(int drawx, int drawy, t_creature* creature ){
if( config.show_creature_names )
if (creature->name.nickname[0] && config.names_use_nick)
{
- draw_textf_border(font, drawx, drawy-(WALLHEIGHT+al_get_font_line_height(font)), 0,
+ draw_textf_border(font, al_map_rgb(255,255,255), drawx, drawy-(WALLHEIGHT+al_get_font_line_height(font)), 0,
"%s", creature->name.nickname );
}
else if (creature->name.first_name[0])
@@ -298,14 +294,14 @@ void DrawCreatureText(int drawx, int drawy, t_creature* creature ){
buffer[127]=0;
ALLEGRO_USTR* temp = bufferToUstr(buffer, 128);
al_ustr_set_chr(temp, 0, charToUpper(al_ustr_get(temp, 0)));
- draw_ustr_border(font, drawx, drawy-(WALLHEIGHT+al_get_font_line_height(font)), 0,
+ draw_ustr_border(font, al_map_rgb(255,255,255), drawx, drawy-(WALLHEIGHT+al_get_font_line_height(font)), 0,
temp );
al_ustr_free(temp);
}
else if (config.names_use_species)
{
if(!config.skipCreatureTypes)
- draw_textf_border(font, drawx, drawy-(WALLHEIGHT+al_get_font_line_height(font)), 0,
+ draw_textf_border(font, al_map_rgb(255,255,255), drawx, drawy-(WALLHEIGHT+al_get_font_line_height(font)), 0,
"[%s]", contentLoader.Mats->race.at(creature->race).id);
}
}