Permalink
Browse files

Apply whitespace fix to SDL2 branch.

  • Loading branch information...
jorgenpt committed Apr 19, 2014
1 parent a147ce9 commit 486baadfe81eeda18c34786d2b5a5f85bebbff02
Showing with 9,685 additions and 9,685 deletions.
  1. +19 −19 AnimView/frmMain.cpp
  2. +1 −1 AnimView/frmSprites.h
  3. +7 −7 AnimView/th.cpp
  4. +2 −2 AnimView/th.h
  5. +1 −1 AnimView/tinystr.h
  6. +52 −52 AnimView/tinyxml.cpp
  7. +73 −73 AnimView/tinyxml.h
  8. +4 −4 AnimView/tinyxmlerror.cpp
  9. +76 −76 AnimView/tinyxmlparser.cpp
  10. +67 −67 CorsixTH/Lua/app.lua
  11. +23 −23 CorsixTH/Lua/audio.lua
  12. +54 −54 CorsixTH/Lua/base_config.lua
  13. +23 −23 CorsixTH/Lua/calls_dispatcher.lua
  14. +4 −4 CorsixTH/Lua/class.lua
  15. +26 −26 CorsixTH/Lua/command.lua
  16. +58 −58 CorsixTH/Lua/command_stack.lua
  17. +45 −45 CorsixTH/Lua/commands/compound.lua
  18. +47 −47 CorsixTH/Lua/commands/set_map_cell.lua
  19. +46 −46 CorsixTH/Lua/commands/set_map_cell_flags.lua
  20. +81 −81 CorsixTH/Lua/config_finder.lua
  21. +9 −9 CorsixTH/Lua/dialogs/adviser.lua
  22. +32 −32 CorsixTH/Lua/dialogs/bottom_panel.lua
  23. +15 −15 CorsixTH/Lua/dialogs/build_room.lua
  24. +3 −3 CorsixTH/Lua/dialogs/confirm_dialog.lua
  25. +64 −64 CorsixTH/Lua/dialogs/edit_room.lua
  26. +5 −5 CorsixTH/Lua/dialogs/fullscreen.lua
  27. +36 −36 CorsixTH/Lua/dialogs/fullscreen/annual_report.lua
  28. +28 −28 CorsixTH/Lua/dialogs/fullscreen/bank_manager.lua
  29. +19 −19 CorsixTH/Lua/dialogs/fullscreen/drug_casebook.lua
  30. +14 −14 CorsixTH/Lua/dialogs/fullscreen/fax.lua
  31. +13 −13 CorsixTH/Lua/dialogs/fullscreen/graphs.lua
  32. +10 −10 CorsixTH/Lua/dialogs/fullscreen/hospital_policy.lua
  33. +16 −16 CorsixTH/Lua/dialogs/fullscreen/progress_report.lua
  34. +18 −18 CorsixTH/Lua/dialogs/fullscreen/research_policy.lua
  35. +24 −24 CorsixTH/Lua/dialogs/fullscreen/staff_management.lua
  36. +15 −15 CorsixTH/Lua/dialogs/fullscreen/town_map.lua
  37. +15 −15 CorsixTH/Lua/dialogs/furnish_corridor.lua
  38. +12 −12 CorsixTH/Lua/dialogs/hire_staff.lua
  39. +10 −10 CorsixTH/Lua/dialogs/information.lua
  40. +8 −8 CorsixTH/Lua/dialogs/jukebox.lua
  41. +5 −5 CorsixTH/Lua/dialogs/machine_dialog.lua
  42. +28 −28 CorsixTH/Lua/dialogs/map_editor.lua
  43. +52 −52 CorsixTH/Lua/dialogs/menu.lua
  44. +5 −5 CorsixTH/Lua/dialogs/message.lua
  45. +10 −10 CorsixTH/Lua/dialogs/patient.lua
  46. +53 −53 CorsixTH/Lua/dialogs/place_objects.lua
  47. +2 −2 CorsixTH/Lua/dialogs/place_staff.lua
  48. +11 −11 CorsixTH/Lua/dialogs/queue_dialog.lua
  49. +17 −17 CorsixTH/Lua/dialogs/resizable.lua
  50. +6 −6 CorsixTH/Lua/dialogs/resizables/calls_dispatcher.lua
  51. +12 −12 CorsixTH/Lua/dialogs/resizables/cheats.lua
  52. +230 −230 CorsixTH/Lua/dialogs/resizables/customise.lua
  53. +6 −6 CorsixTH/Lua/dialogs/resizables/directory_browser.lua
  54. +6 −6 CorsixTH/Lua/dialogs/resizables/dropdown.lua
  55. +5 −5 CorsixTH/Lua/dialogs/resizables/file_browser.lua
  56. +1 −1 CorsixTH/Lua/dialogs/resizables/file_browsers/load_game.lua
  57. +2 −2 CorsixTH/Lua/dialogs/resizables/file_browsers/save_game.lua
  58. +222 −222 CorsixTH/Lua/dialogs/resizables/folder_settings.lua
  59. +8 −8 CorsixTH/Lua/dialogs/resizables/lua_console.lua
  60. +3 −3 CorsixTH/Lua/dialogs/resizables/main_menu.lua
  61. +8 −8 CorsixTH/Lua/dialogs/resizables/menu_list_dialog.lua
  62. +3 −3 CorsixTH/Lua/dialogs/resizables/menu_list_dialogs/custom_game.lua
  63. +4 −4 CorsixTH/Lua/dialogs/resizables/new_game.lua
  64. +22 −22 CorsixTH/Lua/dialogs/resizables/options.lua
  65. +3 −3 CorsixTH/Lua/dialogs/resizables/tip_of_the_day.lua
  66. +130 −130 CorsixTH/Lua/dialogs/resizables/update.lua
  67. +17 −17 CorsixTH/Lua/dialogs/staff_dialog.lua
  68. +2 −2 CorsixTH/Lua/dialogs/staff_rise.lua
  69. +5 −5 CorsixTH/Lua/dialogs/tree_ctrl.lua
  70. +5 −5 CorsixTH/Lua/dialogs/watch.lua
  71. +1 −1 CorsixTH/Lua/diseases/bloaty_head.lua
  72. +1 −1 CorsixTH/Lua/diseases/broken_heart.lua
  73. +1 −1 CorsixTH/Lua/diseases/broken_wind.lua
  74. +1 −1 CorsixTH/Lua/diseases/chronic_nosehair.lua
  75. +1 −1 CorsixTH/Lua/diseases/corrugated_ankles.lua
  76. +1 −1 CorsixTH/Lua/diseases/discrete_itching.lua
  77. +1 −1 CorsixTH/Lua/diseases/fake_blood.lua
  78. +2 −2 CorsixTH/Lua/diseases/fractured_bones.lua
  79. +2 −2 CorsixTH/Lua/diseases/gastric_ejections.lua
  80. +1 −1 CorsixTH/Lua/diseases/golf_stones.lua
  81. +1 −1 CorsixTH/Lua/diseases/gut_rot.lua
  82. +2 −2 CorsixTH/Lua/diseases/hairyitis.lua
  83. +1 −1 CorsixTH/Lua/diseases/heaped_piles.lua
  84. +1 −1 CorsixTH/Lua/diseases/infectious_laughter.lua
  85. +1 −1 CorsixTH/Lua/diseases/jellyitis.lua
  86. +1 −1 CorsixTH/Lua/diseases/kidney_beans.lua
  87. +1 −1 CorsixTH/Lua/diseases/pregnant.lua
  88. +1 −1 CorsixTH/Lua/diseases/ruptured_nodules.lua
  89. +1 −1 CorsixTH/Lua/diseases/serious_radiation.lua
  90. +1 −1 CorsixTH/Lua/diseases/sleeping_illness.lua
  91. +1 −1 CorsixTH/Lua/diseases/spare_ribs.lua
  92. +1 −1 CorsixTH/Lua/diseases/sweaty_palms.lua
  93. +1 −1 CorsixTH/Lua/diseases/the_squits.lua
  94. +1 −1 CorsixTH/Lua/diseases/third_degree_sideburns.lua
  95. +1 −1 CorsixTH/Lua/diseases/tv_personalities.lua
  96. +1 −1 CorsixTH/Lua/diseases/uncommon_cold.lua
  97. +1 −1 CorsixTH/Lua/diseases/unexpected_swelling.lua
  98. +24 −24 CorsixTH/Lua/entities/humanoid.lua
  99. +5 −5 CorsixTH/Lua/entities/machine.lua
  100. +41 −41 CorsixTH/Lua/entities/object.lua
  101. +63 −63 CorsixTH/Lua/entities/patient.lua
  102. +38 −38 CorsixTH/Lua/entities/staff.lua
  103. +2 −2 CorsixTH/Lua/entities/vip.lua
  104. +4 −4 CorsixTH/Lua/entity.lua
  105. +32 −32 CorsixTH/Lua/game_ui.lua
  106. +19 −19 CorsixTH/Lua/graphics.lua
  107. +85 −85 CorsixTH/Lua/hospital.lua
  108. +1 −1 CorsixTH/Lua/humanoid_actions/check_watch.lua
  109. +2 −2 CorsixTH/Lua/humanoid_actions/die.lua
  110. +1 −1 CorsixTH/Lua/humanoid_actions/falling.lua
  111. +1 −1 CorsixTH/Lua/humanoid_actions/get_up.lua
  112. +5 −5 CorsixTH/Lua/humanoid_actions/idle_spawn.lua
  113. +2 −2 CorsixTH/Lua/humanoid_actions/meander.lua
  114. +5 −5 CorsixTH/Lua/humanoid_actions/multi_use_object.lua
  115. +1 −1 CorsixTH/Lua/humanoid_actions/on_ground.lua
  116. +3 −3 CorsixTH/Lua/humanoid_actions/pee.lua
  117. +12 −12 CorsixTH/Lua/humanoid_actions/queue.lua
  118. +3 −3 CorsixTH/Lua/humanoid_actions/seek_reception.lua
  119. +11 −11 CorsixTH/Lua/humanoid_actions/seek_room.lua
  120. +2 −2 CorsixTH/Lua/humanoid_actions/seek_toilets.lua
  121. +1 −1 CorsixTH/Lua/humanoid_actions/shake_fist.lua
  122. +1 −1 CorsixTH/Lua/humanoid_actions/spawn.lua
  123. +1 −1 CorsixTH/Lua/humanoid_actions/tap_foot.lua
  124. +11 −11 CorsixTH/Lua/humanoid_actions/use_object.lua
  125. +6 −6 CorsixTH/Lua/humanoid_actions/use_screen.lua
  126. +6 −6 CorsixTH/Lua/humanoid_actions/use_staffroom.lua
  127. +4 −4 CorsixTH/Lua/humanoid_actions/vip_go_to_next_room.lua
  128. +2 −2 CorsixTH/Lua/humanoid_actions/vomit.lua
  129. +16 −16 CorsixTH/Lua/humanoid_actions/walk.lua
  130. +1 −1 CorsixTH/Lua/humanoid_actions/yawn.lua
  131. +5 −5 CorsixTH/Lua/languages/brazilian_portuguese.lua
  132. +11 −11 CorsixTH/Lua/languages/czech.lua
  133. +264 −264 CorsixTH/Lua/languages/danish.lua
  134. +26 −26 CorsixTH/Lua/languages/dutch.lua
  135. +19 −19 CorsixTH/Lua/languages/english.lua
  136. +239 −239 CorsixTH/Lua/languages/finnish.lua
  137. +3 −3 CorsixTH/Lua/languages/french.lua
  138. +61 −61 CorsixTH/Lua/languages/hungarian.lua
  139. +14 −14 CorsixTH/Lua/languages/iberic_portuguese.lua
  140. +5 −5 CorsixTH/Lua/languages/italian.lua
  141. +2,575 −2,575 CorsixTH/Lua/languages/korean.lua
  142. +257 −257 CorsixTH/Lua/languages/norwegian.lua
  143. +161 −161 CorsixTH/Lua/languages/original_strings.lua
  144. +1 −1 CorsixTH/Lua/languages/polish.lua
  145. +1 −1 CorsixTH/Lua/languages/russian.lua
  146. +14 −14 CorsixTH/Lua/languages/spanish.lua
  147. +1 −1 CorsixTH/Lua/languages/swedish.lua
  148. +4 −4 CorsixTH/Lua/map.lua
  149. +2 −2 CorsixTH/Lua/movie_player.lua
  150. +1 −1 CorsixTH/Lua/objects/analyser.lua
  151. +7 −7 CorsixTH/Lua/objects/bed.lua
  152. +2 −2 CorsixTH/Lua/objects/bench.lua
  153. +1 −1 CorsixTH/Lua/objects/bin.lua
  154. +8 −8 CorsixTH/Lua/objects/console.lua
  155. +5 −5 CorsixTH/Lua/objects/crash_trolley.lua
  156. +7 −7 CorsixTH/Lua/objects/desk.lua
  157. +3 −3 CorsixTH/Lua/objects/door.lua
  158. +3 −3 CorsixTH/Lua/objects/doors/entrance_right_door.lua
  159. +1 −1 CorsixTH/Lua/objects/helicopter.lua
  160. +1 −1 CorsixTH/Lua/objects/litter.lua
  161. +3 −3 CorsixTH/Lua/objects/machines/blood_machine.lua
  162. +2 −2 CorsixTH/Lua/objects/machines/cardio.lua
  163. +5 −5 CorsixTH/Lua/objects/machines/cast_remover.lua
  164. +1 −1 CorsixTH/Lua/objects/machines/dna_fixer.lua
  165. +2 −2 CorsixTH/Lua/objects/machines/electrolyser.lua
  166. +1 −1 CorsixTH/Lua/objects/machines/jelly_moulder.lua
  167. +4 −4 CorsixTH/Lua/objects/machines/scanner.lua
  168. +1 −1 CorsixTH/Lua/objects/machines/shower.lua
  169. +1 −1 CorsixTH/Lua/objects/machines/slicer.lua
  170. +1 −1 CorsixTH/Lua/objects/machines/ultrascanner.lua
  171. +6 −6 CorsixTH/Lua/objects/plant.lua
  172. +2 −2 CorsixTH/Lua/objects/pool_table.lua
  173. +1 −1 CorsixTH/Lua/objects/radiation_shield.lua
  174. +11 −11 CorsixTH/Lua/objects/reception_desk.lua
  175. +1 −1 CorsixTH/Lua/objects/sink.lua
  176. +11 −11 CorsixTH/Lua/persistance.lua
  177. +1 −1 CorsixTH/Lua/queue.lua
  178. +31 −31 CorsixTH/Lua/research_department.lua
  179. +32 −32 CorsixTH/Lua/room.lua
  180. +3 −3 CorsixTH/Lua/rooms/blood_machine_room.lua
  181. +5 −5 CorsixTH/Lua/rooms/decontamination.lua
  182. +5 −5 CorsixTH/Lua/rooms/dna_fixer.lua
  183. +5 −5 CorsixTH/Lua/rooms/electrolysis.lua
  184. +2 −2 CorsixTH/Lua/rooms/fracture_clinic.lua
  185. +4 −4 CorsixTH/Lua/rooms/gp.lua
  186. +2 −2 CorsixTH/Lua/rooms/hair_restoration.lua
  187. +2 −2 CorsixTH/Lua/rooms/inflation.lua
  188. +2 −2 CorsixTH/Lua/rooms/jelly_vat.lua
  189. +16 −16 CorsixTH/Lua/rooms/operating_theatre.lua
  190. +3 −3 CorsixTH/Lua/rooms/pharmacy.lua
  191. +3 −3 CorsixTH/Lua/rooms/psych.lua
  192. +12 −12 CorsixTH/Lua/rooms/research.lua
  193. +6 −6 CorsixTH/Lua/rooms/scanner_room.lua
  194. +11 −11 CorsixTH/Lua/rooms/toilets.lua
  195. +4 −4 CorsixTH/Lua/rooms/training.lua
  196. +2 −2 CorsixTH/Lua/rooms/ultrascan.lua
  197. +26 −26 CorsixTH/Lua/rooms/ward.lua
  198. +3 −3 CorsixTH/Lua/rooms/x_ray_room.lua
  199. +10 −10 CorsixTH/Lua/staff_profile.lua
  200. +1 −1 CorsixTH/Lua/string_extensions.lua
  201. +1 −1 CorsixTH/Lua/strings.lua
  202. +32 −32 CorsixTH/Lua/ui.lua
  203. +3 −3 CorsixTH/Lua/utility.lua
  204. +25 −25 CorsixTH/Lua/window.lua
  205. +70 −70 CorsixTH/Lua/world.lua
  206. +158 −158 CorsixTH/Src/bootstrap.cpp
  207. +2,898 −2,898 CorsixTH/Src/cp936_table.h
  208. +1 −1 CorsixTH/Src/main.cpp
  209. +1 −1 CorsixTH/Src/persist_lua.h
  210. +12 −12 CorsixTH/Src/random.c
  211. +3 −3 CorsixTH/Src/rnc.cpp
  212. +1 −1 CorsixTH/Src/sdl_audio.cpp
  213. +1 −1 CorsixTH/Src/sdl_core.cpp
  214. +3 −3 CorsixTH/Src/th_gfx.cpp
  215. +1 −1 CorsixTH/Src/th_gfx.h
  216. +3 −3 CorsixTH/Src/th_gfx_font.cpp
  217. +1 −1 CorsixTH/Src/th_lua.cpp
  218. +1 −1 CorsixTH/Src/th_lua_anims.cpp
  219. +1 −1 CorsixTH/Src/th_lua_gfx.cpp
  220. +6 −6 CorsixTH/Src/th_lua_map.cpp
  221. +1 −1 CorsixTH/Src/th_lua_movie.cpp
  222. +3 −3 CorsixTH/Src/th_lua_strings.cpp
  223. +12 −12 CorsixTH/Src/th_map.cpp
  224. +1 −1 CorsixTH/Src/th_map.h
  225. +1 −1 CorsixTH/Src/th_map_overlays.cpp
  226. +1 −1 CorsixTH/Src/th_sound.cpp
  227. +4 −4 CorsixTH/SrcUnshared/SDL_main_win32.c
  228. +1 −1 CorsixTH/resource.h
  229. +14 −14 LDocGen/c_tokenise.lua
  230. +1 −1 LDocGen/lua_scan.lua
  231. +12 −12 LDocGen/lua_tokenise.lua
  232. +2 −2 LPEG/lpeg.c
  233. +2 −2 MapEdit/Src/app.cpp
  234. +3 −3 MapEdit/Src/frmMain.cpp
  235. +4 −4 MapEdit/Src/scrollable_game.cpp
  236. +1 −1 MapEdit/Src/scrollable_game.h
  237. +2 −2 MapEdit/Src/th_map_wrapper.cpp
  238. +1 −1 MapEdit/Src/th_map_wrapper.h
  239. +5 −5 SpriteEncoder/parser.cpp
  240. +42 −42 SpriteEncoder/scanner.cpp
  241. +5 −5 SpriteEncoder/tokens.h
View
@@ -112,7 +112,7 @@ frmMain::frmMain()
m_bPlayingAnimation = true;
//m_bPlayingAnimation = false;
pSidebarSizer->Add(pFrame, 0, wxEXPAND | wxALL, 0);
-
+
#define ID(layer, id) (ID_LAYER_CHECKS + (layer) * 25 + (id))
wxStaticBoxSizer *pLayer0 = new wxStaticBoxSizer(wxHORIZONTAL, this, L"Layer 0 (Patient Head)");
pLayer0->Add(new wxCheckBox(this, ID(0, 0), L"0"), 0, wxALIGN_CENTER | wxALL, 1);
@@ -263,7 +263,7 @@ frmMain::frmMain()
SetBackgroundColour(m_btnPlayPause->GetBackgroundColour());
SetSizer(pMainSizer);
-
+
SetMinSize(ClientToWindowSize(pMainSizer->CalcMin()));
SetSize(GetMinSize());
@@ -405,7 +405,7 @@ your hard disk (~250MB). \n If you click No, it will write the XML and element f
the DATA folder, the Animation Viewer will use PNG sprites instead of Theme Hospital data files.",
L"Export Warning", wxYES_NO | wxCANCEL);
if( response == wxYES) { bWriteFrames = true; }
- if( response != wxCANCEL)
+ if( response != wxCANCEL)
{
//Start with animations, then move on to sprite sheets (map tiles)
if(!m_oAnims.loadAnimationFile(_getCaseSensitivePath(L"VSTART-1.ANI", sdPath))
@@ -439,7 +439,7 @@ the DATA folder, the Animation Viewer will use PNG sprites instead of Theme Hosp
wxTextOutputStream outputXml(fosxml);
outputXml.WriteString(wxString::Format(L"<?xml version='1.0' encoding='ISO-8859-1' standalone='no'?>\n"));
outputXml.WriteString(wxString::Format(L"<theme_hospital_graphics scale_factor='1'>\n"));
-
+
int iAnimationCount = 0;
int iFrameCountTotal = 1;
int iElementCount = 0;
@@ -454,15 +454,15 @@ the DATA folder, the Animation Viewer will use PNG sprites instead of Theme Hosp
{
wxFileName::Mkdir(aiPath);
}
- outputXml.WriteString(wxString::Format(L"<an id='%u' fr='%u' un='%u'>\n",
+ outputXml.WriteString(wxString::Format(L"<an id='%u' fr='%u' un='%u'>\n",
iAnimation, m_oAnims.getFrameField(iAnimation), m_oAnims.getUnknownField(iAnimation)));
aiPath += wxFileName::GetPathSeparator();
size_t iFrameCount = m_oAnims.getFrameCount(iAnimation);
for(size_t iFrame = 0; iFrame < iFrameCount; ++iFrame)
{
wxImage imgCanvas;
th_frame_t* pFrame = m_oAnims.getFrameStruct(iAnimation,iFrame);
- outputXml.WriteString(wxString::Format(L"\t<fr id='%u' li='%u' w='%u' h='%u' fl='%u' nx='%u'>\n",
+ outputXml.WriteString(wxString::Format(L"\t<fr id='%u' li='%u' w='%u' h='%u' fl='%u' nx='%u'>\n",
iFrameCountTotal, iListIndex, pFrame->width, pFrame->height, pFrame->flags, pFrame->next));
wxSize oSize;
@@ -488,7 +488,7 @@ the DATA folder, the Animation Viewer will use PNG sprites instead of Theme Hosp
}
m_oAnims.drawFrame(imgCanvas, iAnimation, iFrame, &m_mskLayers, oSize, 0, 0);
- outputLog.WriteString(wxString::Format(L"%s\t%u\t%u\t%u\t%u\t%u\n", L"VSPR-0", iAnimation, iFrame,
+ outputLog.WriteString(wxString::Format(L"%s\t%u\t%u\t%u\t%u\t%u\n", L"VSPR-0", iAnimation, iFrame,
oSize.x, oSize.y, m_oAnims.getUnknownField(iAnimation)));
}
@@ -506,7 +506,7 @@ the DATA folder, the Animation Viewer will use PNG sprites instead of Theme Hosp
iAnimationCount++;
}
}
- //outputXml.WriteString(wxString::Format(L"\t<graphics_totals animations='%u' frames='%u' elements='%u' sprites='%u'>\n",
+ //outputXml.WriteString(wxString::Format(L"\t<graphics_totals animations='%u' frames='%u' elements='%u' sprites='%u'>\n",
// iAnimationCount, iFrameCount, iElementCount, iSpriteCount));
outputXml.WriteString(wxString::Format(L"</theme_hospital_graphics>\n"));
@@ -520,7 +520,7 @@ the DATA folder, the Animation Viewer will use PNG sprites instead of Theme Hosp
exportSpritesPage(true, sdPath, L"WATCH01V");
//Skip DataM directory because it appears to be low-res versions of same
- //Sprite sheet code for QData directory
+ //Sprite sheet code for QData directory
wxString sqPath = _getCaseSensitivePath(L"QDATA", sPath);
sqPath += wxFileName::GetPathSeparator();
exportSpritesPage(true, sqPath, L"AWARD03V", L"", L"AWARD02V.PAL");
@@ -604,7 +604,7 @@ the DATA folder, the Animation Viewer will use PNG sprites instead of Theme Hosp
void frmMain::exportSpritesPage(bool bComplex, wxString sPath, wxString sFilename, wxString spPath, wxString sPalette)
{
- if(spPath.length() == 0)
+ if(spPath.length() == 0)
{
spPath = sPath;
}
@@ -660,7 +660,7 @@ void frmMain::_onToggleMask(wxCommandEvent& evt)
int iID = evt.GetId() - ID_LAYER_CHECKS;
int iLayer = iID / 25;
iID %= 25;
-
+
if(evt.IsChecked())
m_mskLayers.set(iLayer, iID);
else
@@ -985,11 +985,11 @@ wxString frmMain::_getCaseSensitivePath(const wxString& sInsensitivePathPart, co
{
bool found;
bool cont;
-
+
if(!wxFileName::IsCaseSensitive()) { return sPath + sInsensitivePathPart; }
-
+
wxString retStr(sPath);
-
+
wxStringTokenizer pathTokenizer(sInsensitivePathPart, wxFileName::GetPathSeparator());
while(pathTokenizer.HasMoreTokens())
{
@@ -998,9 +998,9 @@ wxString frmMain::_getCaseSensitivePath(const wxString& sInsensitivePathPart, co
{
break;
}
-
+
wxString pathPart = pathTokenizer.GetNextToken();
-
+
wxString realName;
cont = dir.GetFirst(&realName, wxEmptyString, wxDIR_DIRS|wxDIR_FILES|wxDIR_HIDDEN|wxDIR_DOTDOT);
found = false;
@@ -1018,15 +1018,15 @@ wxString frmMain::_getCaseSensitivePath(const wxString& sInsensitivePathPart, co
}
cont = dir.GetNext(&realName);
}
-
+
if(!found)
{
retStr += wxFileName::GetPathSeparator();
retStr += pathPart;
break;
}
}
-
+
while(pathTokenizer.HasMoreTokens())
{
wxString pathPart = pathTokenizer.GetNextToken();
@@ -1036,6 +1036,6 @@ wxString frmMain::_getCaseSensitivePath(const wxString& sInsensitivePathPart, co
}
retStr += pathPart;
}
-
+
return retStr;
}
View
@@ -66,7 +66,7 @@ class frmSprites : public wxFrame
std::vector<_sprite_t> m_vSprites;
THAnimations m_oAnims;
-
+
wxTextCtrl* m_txtTable;
wxTextCtrl* m_txtData;
wxTextCtrl* m_txtPalette;
View
@@ -481,7 +481,7 @@ bool THAnimations::loadXMLFile(TiXmlDocument* xmlDocument)
return m_bXmlLoaded;
}
-void THAnimations::writeElementData(wxString aPath, wxTextOutputStream *outputLog, wxTextOutputStream *outputXml,
+void THAnimations::writeElementData(wxString aPath, wxTextOutputStream *outputLog, wxTextOutputStream *outputXml,
size_t iAnimation, size_t iFrame, const THLayerMask* pMask, wxSize& size, int *iListIndex)
{
if(iAnimation >= m_iAnimCount)
@@ -504,7 +504,7 @@ void THAnimations::writeElementData(wxString aPath, wxTextOutputStream *outputLo
if(pElement->flags >> 4 != 1)
{
uint16_t iElementIndex = m_pElementList[iOldListIndex];
- outputXml->WriteString(wxString::Format(L"\t\t<el id='%u' tb='%u' fl='%u' ox='%u' oy='%u' ly='%u' ",
+ outputXml->WriteString(wxString::Format(L"\t\t<el id='%u' tb='%u' fl='%u' ox='%u' oy='%u' ly='%u' ",
iElementIndex, pElement->table_position, pElement->flags, pElement->offx, pElement->offy, pElement->layerid ));
uint16_t iSpriteIndex = pElement->table_position / sizeof(th_sprite_t);
wxString spriteFile = aPath + wxString::Format(L"a%04ue.png", iSpriteIndex);
@@ -518,7 +518,7 @@ void THAnimations::writeElementData(wxString aPath, wxTextOutputStream *outputLo
iFarY = iBottom;
//if(pMask != NULL && !pMask->isSet(pElement->flags >> 4, pElement->layerid))
// continue;
- outputXml->WriteString(wxString::Format(L"sp='%u' of='%u' w='%u' h='%u'/>\n",
+ outputXml->WriteString(wxString::Format(L"sp='%u' of='%u' w='%u' h='%u'/>\n",
iSpriteIndex, pSprite->offset, pSprite->width, pSprite->height ));
if(!wxFileName::FileExists(spriteFile) && pSprite->width > 0 && pSprite->height > 0)
{
@@ -539,8 +539,8 @@ void THAnimations::writeElementData(wxString aPath, wxTextOutputStream *outputLo
getSpriteBitmap(iSpriteIndex)->blit(imgSprite, 0, 0, m_pGhostMaps + m_iGhostMapOffset, m_pColours, 0 & 0xF);
if(!imgSprite.SaveFile(spriteFile,wxBITMAP_TYPE_PNG))
return;
- outputLog->WriteString(wxString::Format(L"E%u\t%u\t%u\t%u\t%u\t%u\t%u\t%u\t%u\t%u\t%u\n", iSpriteIndex,
- pElement->table_position, pElement->flags, pElement->layerid, pElement->offx, pElement->offy,
+ outputLog->WriteString(wxString::Format(L"E%u\t%u\t%u\t%u\t%u\t%u\t%u\t%u\t%u\t%u\t%u\n", iSpriteIndex,
+ pElement->table_position, pElement->flags, pElement->layerid, pElement->offx, pElement->offy,
iNewListIndex, sizeof(th_sprite_t), pSprite->width, pSprite->height, pSprite->offset));
}
iNewListIndex++;
@@ -750,7 +750,7 @@ void THAnimations::drawFrame(wxImage& imgCanvas, size_t iAnimation, size_t iFram
}
void THAnimations::copySpriteToCanvas(wxString spriteFile, int iSpriteIndex, wxImage& imgCanvas, int iX, int iY, int iFlags) {
- if(!m_pSpriteImages[iSpriteIndex].IsOk())
+ if(!m_pSpriteImages[iSpriteIndex].IsOk())
{
th_sprite_t* pSprite = m_pSprites + iSpriteIndex;
if(m_pSpriteScaleFactors[iSpriteIndex] > 1)
@@ -764,7 +764,7 @@ void THAnimations::copySpriteToCanvas(wxString spriteFile, int iSpriteIndex, wxI
m_pSpriteImages[iSpriteIndex].LoadFile(spriteFile,wxBITMAP_TYPE_PNG);
}
//m_pSpriteImages[iSpriteIndex].SetMaskColour(0,0,0);
- if(!m_pSpriteImages[iSpriteIndex].HasAlpha())
+ if(!m_pSpriteImages[iSpriteIndex].HasAlpha())
{
m_pSpriteImages[iSpriteIndex].InitAlpha();
}
View
@@ -177,7 +177,7 @@ class THAnimations
bool loadGhostFile(wxString sFilename, int iIndex);
bool loadXMLFile(TiXmlDocument* xmlDocument);
- void writeElementData(wxString aPath, wxTextOutputStream *outputLog, wxTextOutputStream *outputXml,
+ void writeElementData(wxString aPath, wxTextOutputStream *outputLog, wxTextOutputStream *outputXml,
size_t iAnimation, size_t iFrame, const THLayerMask* pMask, wxSize& size, int* iListIndex);
void writeTableDataHeader(wxTextOutputStream *outputLog);
@@ -257,4 +257,4 @@ class THAnimations
size_t m_iColourCount;
bool m_bXmlLoaded;
wxString m_sSpritePath;
-};
+};
View
@@ -224,7 +224,7 @@ class TiXmlString
// to the normal allocation, although use an 'int' for systems
// that are overly picky about structure alignment.
const size_type bytesNeeded = sizeof(Rep) + cap;
- const size_type intsNeeded = ( bytesNeeded + sizeof(int) - 1 ) / sizeof( int );
+ const size_type intsNeeded = ( bytesNeeded + sizeof(int) - 1 ) / sizeof( int );
rep_ = reinterpret_cast<Rep*>( new int[ intsNeeded ] );
rep_->str[ rep_->size = sz ] = '\0';
Oops, something went wrong.

0 comments on commit 486baad

Please sign in to comment.