summaryrefslogtreecommitdiff
path: root/GUI.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2011-11-15 22:00:28 +0100
committerPetr Mrázek2011-11-15 22:00:28 +0100
commit795ae480a867253ec50300b99e8491280d3809ff (patch)
tree53996003f3c1f2b5ee155e669fff86549363a01b /GUI.cpp
parentb1b1414ab7b46d9c408c9bdb1c561ee3684d86ed (diff)
downloadstonesense-795ae480a867253ec50300b99e8491280d3809ff.tar.gz
stonesense-795ae480a867253ec50300b99e8491280d3809ff.tar.bz2
stonesense-795ae480a867253ec50300b99e8491280d3809ff.tar.xz
Kill lambda!
Diffstat (limited to 'GUI.cpp')
-rw-r--r--GUI.cpp43
1 files changed, 20 insertions, 23 deletions
diff --git a/GUI.cpp b/GUI.cpp
index 44489cd..7ca1253 100644
--- a/GUI.cpp
+++ b/GUI.cpp
@@ -806,33 +806,30 @@ void paintboard(){
}
-
-
-
+bool load_from_path (ALLEGRO_PATH * p, const char * filename, ALLEGRO_BITMAP *& imgd)
+{
+ int index;
+ al_set_path_filename(p,filename);
+ index = loadImgFile(al_path_cstr(p,ALLEGRO_NATIVE_PATH_SEP));
+ if(index == -1)
+ {
+ return false;
+ }
+ imgd = al_create_sub_bitmap(IMGFilelist[index], 0, 0, al_get_bitmap_width(IMGFilelist[index]), al_get_bitmap_height(IMGFilelist[index]));
+ return true;
+}
void loadGraphicsFromDisk()
{
ALLEGRO_PATH * p = al_create_path_for_directory("stonesense");
- auto globulate = [&](const char * filename, ALLEGRO_BITMAP *& imgd ) -> bool
- {
- int index;
- al_set_path_filename(p,filename);
- index = loadImgFile(al_path_cstr(p,ALLEGRO_NATIVE_PATH_SEP));
- if(index == -1)
- {
- return false;
- }
- imgd = al_create_sub_bitmap(IMGFilelist[index], 0, 0, al_get_bitmap_width(IMGFilelist[index]), al_get_bitmap_height(IMGFilelist[index]));
- return true;
- };
- if(!globulate("objects.png", IMGObjectSheet)) return;
- if(!globulate("creatures.png", IMGCreatureSheet)) return;
- if(!globulate("ramps.png", IMGRampSheet)) return;
- if(!globulate("SSStatusIcons.png", IMGStatusSheet)) return;
- if(!globulate("gibs.png", IMGBloodSheet)) return;
- if(!globulate("engravings_floor.png", IMGEngFloorSheet)) return;
- if(!globulate("engravings_left.png", IMGEngLeftSheet)) return;
- if(!globulate("engravings_right.png", IMGEngRightSheet)) return;
+ if(!load_from_path("objects.png", IMGObjectSheet)) return;
+ if(!load_from_path("creatures.png", IMGCreatureSheet)) return;
+ if(!load_from_path("ramps.png", IMGRampSheet)) return;
+ if(!load_from_path("SSStatusIcons.png", IMGStatusSheet)) return;
+ if(!load_from_path("gibs.png", IMGBloodSheet)) return;
+ if(!load_from_path("engravings_floor.png", IMGEngFloorSheet)) return;
+ if(!load_from_path("engravings_left.png", IMGEngLeftSheet)) return;
+ if(!load_from_path("engravings_right.png", IMGEngRightSheet)) return;
al_destroy_path(p);
createEffectSprites();
}