openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Re-indent stuff touched by recent commits

Browse Source
This commit is contained in:
Celtic Minstrel
2014-12-18 12:55:35 -05:00
parent 5d8f974742
commit a672ec050d
3 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osx/scenedit/scen.graphics.cpp
View File

@@ -815,8 +815,8 @@ void draw_terrain(){
}
else {
tileImage(ter_draw_gworld, terrain_rect,bg[17]);
frame_rect(ter_draw_gworld, terrain_rect, sf::Color::Black);
tileImage(ter_draw_gworld, terrain_rect,bg[17]);
frame_rect(ter_draw_gworld, terrain_rect, sf::Color::Black);
// Width available: 64 4x4 tiles, 42 6x6 tiles, or 21 12x12 tiles -- 256 pixels
// Height available: 81 4x4 tiles, 54 6x6 tiles, or 27 12x12 tiles -- 324 pixels
short size = mini_map_scales[cur_viewing_mode - 1];
@@ -833,8 +833,8 @@ void draw_terrain(){
for(q = xMin; q < xMax; q++)
for(r = yMin; r < yMax; r++) {
t_to_draw = editing_town ? town->terrain(q,r) : current_terrain.terrain[q][r];
draw_one_tiny_terrain_spot(q-xMin,r-yMin,t_to_draw,size);
small_what_drawn[q][r] = t_to_draw;
draw_one_tiny_terrain_spot(q-xMin,r-yMin,t_to_draw,size);
small_what_drawn[q][r] = t_to_draw;
}
small_any_drawn = true;
}

16
osx/scenedit/scen.townout.cpp
View File

@@ -283,7 +283,7 @@ static bool get_placed_item_in_dlog(cDialog& me, cTown::cItem& store_placed_item
store_placed_item.ability = me["charges"].getTextAsNum();
if(store_placed_item.ability < -1 || store_placed_item.ability > 2500) {
giveError("Number of charges/amount of gold or food must be from 0 to 2500.",
"If an item with charges (not gold or food) leave this at -1 for the item to have the default number of charges.",&me);
"If an item with charges (not gold or food) leave this at -1 for the item to have the default number of charges.",&me);
return true;
}
@@ -331,13 +331,13 @@ static bool edit_sign_event_filter(cDialog& me, short which_sign) {
town->sign_strs[which_sign] = me["text"].getText();
else current_terrain.sign_strs[which_sign] = me["text"].getText();
#if 0 // TODO: Apparently there used to be left/right buttons on this dialog.
if(item_hit == 3)
store_which_sign--;
else store_which_sign++;
if(store_which_sign < 0)
store_which_sign = (editing_town) ? 14 : 7;
if(store_which_sign > (editing_town) ? 14 : 7)
store_which_sign = 0;
if(item_hit == 3)
store_which_sign--;
else store_which_sign++;
if(store_which_sign < 0)
store_which_sign = (editing_town) ? 14 : 7;
if(store_which_sign > (editing_town) ? 14 : 7)
store_which_sign = 0;
#endif
return true;
}