From a52a4c20c181373233175fd9659138af39d24a3e Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Sun, 17 May 2009 01:03:22 +0000 Subject: [PATCH] Fixed special spots; they now appear in-game, and disappear when they should. git-svn-id: http://openexile.googlecode.com/svn/trunk@58 4ebdad44-0ea0-11de-aab3-ff745001d230 --- osx/BoE.xcodeproj/project.pbxproj | 14 ----------- osx/Scenario Editor/Blades of Exile Graphics | Bin 4983005 -> 4983005 bytes osx/Scenario Editor/scen.actions.cpp | 6 ++--- osx/Scenario Editor/scen.core.cpp | 2 +- osx/Scenario Editor/scen.fileio.cpp | 2 +- osx/Scenario Editor/scen.graphics.cpp | 6 ++--- osx/Scenario Editor/scen.graphics.h | 2 +- osx/Scenario Editor/scen.townout.cpp | 4 +-- osx/boe.fileio.cpp | 4 ++- osx/boe.graphics.cpp | 2 +- osx/boe.locutils.cpp | 4 +-- osx/boe.specials.cpp | 5 ++-- osx/boe.town.cpp | 6 ++--- osx/classes/item.cpp | 9 ++++--- osx/classes/party.cpp | 2 +- osx/classes/pc.cpp | 3 ++- osx/classes/regtown.cpp | 6 ++--- osx/classes/universe.cpp | 25 +++++++++++++++++-- osx/classes/universe.h | 7 ++++-- osx/tools/fileio.cpp | 3 ++- 20 files changed, 64 insertions(+), 48 deletions(-) diff --git a/osx/BoE.xcodeproj/project.pbxproj b/osx/BoE.xcodeproj/project.pbxproj index 23c50f63..461f4d03 100644 --- a/osx/BoE.xcodeproj/project.pbxproj +++ b/osx/BoE.xcodeproj/project.pbxproj @@ -42,18 +42,11 @@ 2BF04B2D0BF51924006C0831 /* boe.text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BF04B070BF51924006C0831 /* boe.text.cpp */; }; 2BF04B2E0BF51924006C0831 /* boe.town.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BF04B090BF51924006C0831 /* boe.town.cpp */; }; 2BF04DE90BF7A6FE006C0831 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BF04DE80BF7A6FE006C0831 /* Carbon.framework */; }; - 910BBA450FB8E345001E34EA /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 910BBA180FB8BECA001E34EA /* dialog.cpp */; }; - 910BBA460FB8E347001E34EA /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 910BBA3C0FB8DA8E001E34EA /* control.cpp */; }; 910BBA470FB8E34E001E34EA /* ticpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 910BBA270FB8C459001E34EA /* ticpp.cpp */; }; 910BBA480FB8E34E001E34EA /* tinystr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 910BBA2E0FB8C459001E34EA /* tinystr.cpp */; }; 910BBA490FB8E34F001E34EA /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 910BBA2A0FB8C459001E34EA /* tinyxml.cpp */; }; 910BBA4A0FB8E350001E34EA /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 910BBA2C0FB8C459001E34EA /* tinyxmlerror.cpp */; }; 910BBA4B0FB8E351001E34EA /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 910BBA2D0FB8C459001E34EA /* tinyxmlparser.cpp */; }; - 910BBA8A0FB8EC57001E34EA /* button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 910BBA890FB8EC57001E34EA /* button.cpp */; }; - 910BBAAA0FB8F733001E34EA /* pict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 910BBAA90FB8F733001E34EA /* pict.cpp */; }; - 910BBAB60FB91A26001E34EA /* field.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 910BBAB50FB91A26001E34EA /* field.cpp */; }; - 910BBABA0FB91ADB001E34EA /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 910BBAB90FB91ADB001E34EA /* message.cpp */; }; - 910BBADB0FB91D2A001E34EA /* dlogutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 910BBADA0FB91D2A001E34EA /* dlogutil.cpp */; }; 9127903E0F9B7F49007B0D52 /* boe.actions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BF04ACF0BF51923006C0831 /* boe.actions.cpp */; }; 9127903F0F9B7F50007B0D52 /* boe.graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BF04AD30BF51923006C0831 /* boe.graphics.cpp */; }; 912793640F9C107B007B0D52 /* viewdlog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91B3EEF80F969BA700BF5B67 /* viewdlog.cpp */; }; @@ -1158,18 +1151,11 @@ 91AC60A90FA26C1B00EEAE67 /* tmpltown.cpp in Sources */, 91AC620C0FA2853700EEAE67 /* creatlist.cpp in Sources */, 91AC65520FA3441B00EEAE67 /* universe.cpp in Sources */, - 910BBA450FB8E345001E34EA /* dialog.cpp in Sources */, - 910BBA460FB8E347001E34EA /* control.cpp in Sources */, 910BBA470FB8E34E001E34EA /* ticpp.cpp in Sources */, 910BBA480FB8E34E001E34EA /* tinystr.cpp in Sources */, 910BBA490FB8E34F001E34EA /* tinyxml.cpp in Sources */, 910BBA4A0FB8E350001E34EA /* tinyxmlerror.cpp in Sources */, 910BBA4B0FB8E351001E34EA /* tinyxmlparser.cpp in Sources */, - 910BBA8A0FB8EC57001E34EA /* button.cpp in Sources */, - 910BBAAA0FB8F733001E34EA /* pict.cpp in Sources */, - 910BBAB60FB91A26001E34EA /* field.cpp in Sources */, - 910BBABA0FB91ADB001E34EA /* message.cpp in Sources */, - 910BBADB0FB91D2A001E34EA /* dlogutil.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/osx/Scenario Editor/Blades of Exile Graphics b/osx/Scenario Editor/Blades of Exile Graphics index 3fe51a003f5070fc9d26d8148efebd1bdd31e182..659e38b351d2cd4a91e7bbc64a769e9f4ff5fe2e 100644 GIT binary patch delta 248 zcmWN=yH3Jj7=YpLr&_C`ts))~j}#P;dd3qd6+yiTFM-jq!<#sBCk`g8ja&ywHys%r z{qp1)^*>W19brgeF~KA@Q#edB!z^j$n8(FqfkiSbk!6_`R#{`64RUOfXNzri*kzA> z3iuQ$alj#EDpWb5M!+#AoN~rF7hF>3ifeAT<&FkT?s@oX{eCwbNqe@~Vo4a8$ixy$ zB5%@@K#3zcFJE^(S31#89L82+5;K;u{K>ltKKx-zhx$>s^^@-Cu71`p1Aq8BX#WEb C)l$Cz delta 248 zcmWN=xlRI66oBD#83h*vMRAvr#X(U7cid1}U0#L`3X5C(iM4NHVM2Q&&p|S!C8eb& zU%v6@S7fX$h6o;0OcN!>471EJPn-o3Bw1vM6w9oTW|cM8*(uBdU%4Y%BJPn`!IdHQbr{?y|(AyJ7*UOa28apELY zJyn%j#`?~;NvYVrEjrJ6p$W~zOyo}uright = a; \ No newline at end of file +//}r->right = a; diff --git a/osx/Scenario Editor/scen.graphics.cpp b/osx/Scenario Editor/scen.graphics.cpp index 4b9b3465..21f82098 100644 --- a/osx/Scenario Editor/scen.graphics.cpp +++ b/osx/Scenario Editor/scen.graphics.cpp @@ -732,7 +732,7 @@ void draw_terrain(){ } draw_one_terrain_spot(q,r,t_to_draw); - if((editing_town && is_field_type(cen_x + q - 4,cen_y + r - 4, 1)) || + if((editing_town && is_field_type(cen_x + q - 4,cen_y + r - 4, 2)) || (!editing_town && current_terrain.special_spot[cen_x + q - 4][cen_y + r - 4])) Draw_Some_Item(roads_gworld, calc_rect(6, 0), ter_draw_gworld, where_draw, 1, 0); @@ -1350,7 +1350,7 @@ void place_just_location() { sprintf((char *) draw_str,"Center: x = %d, y = %d ",cen_x,cen_y); else { //MoveTo(5 ,terrain_rects[255].top + 28); - sprintf((char *) draw_str,"Click terrain to edit. ",cen_x,cen_y); + sprintf((char *) draw_str,"Click terrain to edit. "); } c2pstr((char*) draw_str); DrawString(draw_str); @@ -1585,4 +1585,4 @@ bool container_there(location l) { // GetIndString(str, i, j); // p2cstr(str); //} -void record_display_strings(){} \ No newline at end of file +void record_display_strings(){} diff --git a/osx/Scenario Editor/scen.graphics.h b/osx/Scenario Editor/scen.graphics.h index 02c1bed7..5fa95869 100644 --- a/osx/Scenario Editor/scen.graphics.h +++ b/osx/Scenario Editor/scen.graphics.h @@ -61,4 +61,4 @@ short string_length(char *str); Rect get_custom_rect (short which_rect); GWorldPtr load_bmp(unsigned char *data, long length); void init_dialogs(); -void record_display_strings(); \ No newline at end of file +void record_display_strings(); diff --git a/osx/Scenario Editor/scen.townout.cpp b/osx/Scenario Editor/scen.townout.cpp index c1009973..c41245f6 100644 --- a/osx/Scenario Editor/scen.townout.cpp +++ b/osx/Scenario Editor/scen.townout.cpp @@ -1225,7 +1225,7 @@ bool save_talk_node() { if ((store_talk_node.personality >= 0) && ((store_talk_node.personality < cur_town * 10) || (store_talk_node.personality >= (cur_town + 1) * 10))) { sprintf((char *) str,"The legal range for personalities in this town is from %d to %d.", - cur_town * 10,cur_town * 10 + 9,817); + cur_town * 10,cur_town * 10 + 9); give_error("Personalities in talk nodes must be -1 (for unused node), -2 (all personalities use) or in the legal range of personalities in this town.", (char *) str,817); return false; @@ -1694,4 +1694,4 @@ short pick_import_town(short def, FSSpec* temp_file_to_load) { cd_kill_dialog(841); return dialog_answer; -} \ No newline at end of file +} diff --git a/osx/boe.fileio.cpp b/osx/boe.fileio.cpp index d45c069e..fa0f7330 100644 --- a/osx/boe.fileio.cpp +++ b/osx/boe.fileio.cpp @@ -545,9 +545,11 @@ void init_town(){ // formerly part of load_town for (i = 0; i < univ.town->preset_fields.size(); i++) { switch(univ.town->preset_fields[i].type){ case 1: // currently unused + univ.town.set_block(univ.town->preset_fields[i].loc.x,univ.town->preset_fields[i].loc.y,true); + break; + case 2: univ.town.set_spot(univ.town->preset_fields[i].loc.x,univ.town->preset_fields[i].loc.y,true); break; - // case 2 is covered by the preceding loop case 3: univ.town.set_web(univ.town->preset_fields[i].loc.x,univ.town->preset_fields[i].loc.y,true); break; diff --git a/osx/boe.graphics.cpp b/osx/boe.graphics.cpp index 240bd612..d09f502f 100644 --- a/osx/boe.graphics.cpp +++ b/osx/boe.graphics.cpp @@ -2030,7 +2030,7 @@ void draw_terrain(short mode) } if((is_town() && univ.town.is_spot(where_draw.x,where_draw.y)) || (is_out() && univ.out.outdoors[univ.party.i_w_c.x][univ.party.i_w_c.y].special_spot[where_draw.x][where_draw.y])) - Draw_Some_Item(roads_gworld, calc_rect(6, 0), terrain_screen_gworld, where_draw, 1, 0); + Draw_Some_Item(roads_gworld, calc_rect(6, 0), terrain_screen_gworld, loc(q,r), 1, 0); } } diff --git a/osx/boe.locutils.cpp b/osx/boe.locutils.cpp index 6b24682b..4f82a49e 100644 --- a/osx/boe.locutils.cpp +++ b/osx/boe.locutils.cpp @@ -395,8 +395,8 @@ bool is_blocked(location to_check) // Keep away from marked specials during combat if ((is_combat()) && univ.town.is_spot(to_check.x, to_check.y)) return true; - if ((is_combat()) && (gr == 406)) - return true; // TODO: Replace gr == 406 with a blockage == clear/special && is_special() check + if ((is_combat()) && (scenario.ter_types[coord_to_ter(to_check.x,to_check.y)].trim_type == TRIM_CITY)) + return true; // TODO: Maybe replace TRIM_CITY with a blockage == clear/special && is_special() check // Party there? if (is_town()) diff --git a/osx/boe.specials.cpp b/osx/boe.specials.cpp index 60f3d128..11026f1d 100644 --- a/osx/boe.specials.cpp +++ b/osx/boe.specials.cpp @@ -204,9 +204,10 @@ bool check_special_terrain(location where_check,short mode,short which_pc,short } } - if ((is_combat()) && (univ.town.is_spot(where_check.x, where_check.y) || (ter_pic == 406))) { + if ((is_combat()) && (univ.town.is_spot(where_check.x, where_check.y) || + (scenario.ter_types[coord_to_ter(where_check.x, where_check.y)].trim_type == TRIM_CITY))) { ASB("Move: Can't trigger this special in combat."); - return false; // TODO: Replace ter_pic == 406 with a blockage == clear/special && is_special() check + return false; // TODO: Maybe replace TRIM_CITY check with a blockage == clear/special && is_special() check? } if (((mode == 1) || ((mode == 2) && (which_combat_type == 1))) diff --git a/osx/boe.town.cpp b/osx/boe.town.cpp index ad0316b9..fe55ee58 100644 --- a/osx/boe.town.cpp +++ b/osx/boe.town.cpp @@ -1319,7 +1319,7 @@ void erase_out_specials() for (i = 0; i < 2; i++) for (j = 0; j < 2; j++) if (quadrant_legal(i,j) == true) { - for (k = 0; k < 18; k++) + for (k = 0; k < 18; k++) { //if (univ.out.outdoors[i][j].special_id[k] >= 0) { out_num = scenario.out_width * (univ.party.outdoor_corner.y + j) + univ.party.outdoor_corner.x + i; @@ -1347,9 +1347,7 @@ void erase_out_specials() } univ.out.outdoors[i][j].special_spot[where.x][where.y] = false; } - - - //} + } } } diff --git a/osx/classes/item.cpp b/osx/classes/item.cpp index 2885dc8a..b9b69c2b 100644 --- a/osx/classes/item.cpp +++ b/osx/classes/item.cpp @@ -385,15 +385,15 @@ void cItemRec::readAttrFrom(string cur, istream& sin){ } ostream& operator << (ostream& out, eWeapType& e){ - out << (int) e; + return out << (int) e; } ostream& operator << (ostream& out, eItemType& e){ - out << (int) e; + return out << (int) e; } ostream& operator << (ostream& out, eItemAbil& e){ - out << (int) e; + return out << (int) e; } istream& operator >> (istream& in, eWeapType& e){ @@ -402,6 +402,7 @@ istream& operator >> (istream& in, eWeapType& e){ if(i > 0 && i < 4) e = (eWeapType) i; else e = ITEM_NOT_MELEE; + return in; } istream& operator >> (istream& in, eItemType& e){ @@ -410,6 +411,7 @@ istream& operator >> (istream& in, eItemType& e){ if(i > 0 && i < 28) e = (eItemType) i; else e = ITEM_TYPE_NO_ITEM; + return in; } istream& operator >> (istream& in, eItemAbil& e){ @@ -420,4 +422,5 @@ istream& operator >> (istream& in, eItemAbil& e){ (i > 149 && i < 162) || (i > 169 && i < 177)) e = (eItemAbil) i; else e = ITEM_NO_ABILITY; + return in; } diff --git a/osx/classes/party.cpp b/osx/classes/party.cpp index 1cfd4fd7..4b77f275 100644 --- a/osx/classes/party.cpp +++ b/osx/classes/party.cpp @@ -448,4 +448,4 @@ void cParty::readFrom(istream& file){ for(int j = 0; j < 64; j++) for(int k = 0; k < 64; k++) bin >> setup[i][j][k]; -} \ No newline at end of file +} diff --git a/osx/classes/pc.cpp b/osx/classes/pc.cpp index 959999bd..b18e2bbc 100644 --- a/osx/classes/pc.cpp +++ b/osx/classes/pc.cpp @@ -355,7 +355,7 @@ void cPlayer::readFrom(istream& file){ } ostream& operator << (ostream& out, eMainStatus& e){ - out << (int) e; + return out << (int) e; } istream& operator >> (istream& in, eMainStatus& e){ @@ -364,4 +364,5 @@ istream& operator >> (istream& in, eMainStatus& e){ if(i > 0 && i < 18 && i !=8 && i != 9) e = (eMainStatus) i; else e = MAIN_STATUS_ABSENT; + return in; } diff --git a/osx/classes/regtown.cpp b/osx/classes/regtown.cpp index b5e10cf4..3ede9d74 100644 --- a/osx/classes/regtown.cpp +++ b/osx/classes/regtown.cpp @@ -15,7 +15,7 @@ __attribute__((deprecated)) void cTinyTown::append(legacy::tiny_tr_type& old){ int i,j; cField the_field; - the_field.type = 1; + the_field.type = 2; for (i = 0; i < 32; i++) for (j = 0; j < 32; j++) { _terrain[i][j] = old.terrain[i][j]; @@ -57,7 +57,7 @@ __attribute__((deprecated)) void cMedTown::append(legacy::ave_tr_type& old){ int i,j; cField the_field; - the_field.type = 1; + the_field.type = 2; for (i = 0; i < 48; i++) for (j = 0; j < 48; j++) { _terrain[i][j] = old.terrain[i][j]; @@ -99,7 +99,7 @@ __attribute__((deprecated)) void cBigTown::append(legacy::big_tr_type& old){ int i,j; cField the_field; - the_field.type = 1; + the_field.type = 2; for (i = 0; i < 64; i++) for (j = 0; j < 64; j++) { _terrain[i][j] = old.terrain[i][j]; diff --git a/osx/classes/universe.cpp b/osx/classes/universe.cpp index cdb46ac6..364b6f5f 100644 --- a/osx/classes/universe.cpp +++ b/osx/classes/universe.cpp @@ -154,11 +154,15 @@ bool cCurTown::is_sleep_cloud(char x, char y) const{ return fields[x][y] & 128L; } -bool cCurTown::is_spot(char x, char y) const{ // currently unused +bool cCurTown::is_block(char x, char y) const{ // currently unused if(x > record->max_dim() || y > record->max_dim()) return false; return fields[x][y] & 256L; } +bool cCurTown::is_spot(char x, char y) const{ + return special_spot[x][y]; +} + bool cCurTown::is_special(char x, char y) const{ if(x > record->max_dim() || y > record->max_dim()) return false; return fields[x][y] & 512L; @@ -238,6 +242,7 @@ bool cCurTown::set_explored(char x, char y, bool b){ if(x > record->max_dim() || y > record->max_dim()) return false; if(b) fields[x][y] |= 1L; else fields[x][y] &= ~1L; + return true; } bool cCurTown::set_force_wall(char x, char y, bool b){ @@ -348,16 +353,24 @@ bool cCurTown::set_sleep_cloud(char x, char y, bool b){ return true; } -bool cCurTown::set_spot(char x, char y, bool b){ // currently unused +bool cCurTown::set_block(char x, char y, bool b){ // currently unused if(x > record->max_dim() || y > record->max_dim()) return false; if(b) fields[x][y] |= 256L; else fields[x][y] &= ~256L; + return true; +} + +bool cCurTown::set_spot(char x, char y, bool b){ + if(x > record->max_dim() || y > record->max_dim()) return false; + special_spot[x][y] = b; + return true; } bool cCurTown::set_special(char x, char y, bool b){ if(x > record->max_dim() || y > record->max_dim()) return false; if(b) fields[x][y] |= 512L; else fields[x][y] &= ~512L; + return true; } bool cCurTown::set_web(char x, char y, bool b){ @@ -479,6 +492,7 @@ bool cCurTown::set_sm_blood(char x, char y, bool b){ set_rubble(x,y,false); } else fields[x][y] &= ~65536L; + return true; } bool cCurTown::set_med_blood(char x, char y, bool b){ @@ -495,6 +509,7 @@ bool cCurTown::set_med_blood(char x, char y, bool b){ set_rubble(x,y,false); } else fields[x][y] &= ~131072L; + return true; } bool cCurTown::set_lg_blood(char x, char y, bool b){ @@ -510,6 +525,7 @@ bool cCurTown::set_lg_blood(char x, char y, bool b){ set_rubble(x,y,false); } else fields[x][y] &= ~262144L; + return true; } bool cCurTown::set_sm_slime(char x, char y, bool b){ @@ -525,6 +541,7 @@ bool cCurTown::set_sm_slime(char x, char y, bool b){ set_rubble(x,y,false); } else fields[x][y] &= ~524288L; + return true; } bool cCurTown::set_lg_slime(char x, char y, bool b){ @@ -540,6 +557,7 @@ bool cCurTown::set_lg_slime(char x, char y, bool b){ set_rubble(x,y,false); } else fields[x][y] &= ~1048576L; + return true; } bool cCurTown::set_ash(char x, char y, bool b){ @@ -555,6 +573,7 @@ bool cCurTown::set_ash(char x, char y, bool b){ set_rubble(x,y,false); } else fields[x][y] &= ~2097152L; + return true; } bool cCurTown::set_bones(char x, char y, bool b){ @@ -570,6 +589,7 @@ bool cCurTown::set_bones(char x, char y, bool b){ set_rubble(x,y,false); } else fields[x][y] &= ~4194304L; + return true; } bool cCurTown::set_rubble(char x, char y, bool b){ @@ -585,6 +605,7 @@ bool cCurTown::set_rubble(char x, char y, bool b){ set_bones(x,y,false); } else fields[x][y] &= ~8388608L; + return true; } unsigned char cCurTown::explored(char x,char y) const{ diff --git a/osx/classes/universe.h b/osx/classes/universe.h index 1e1b3ea3..ecc3f62f 100644 --- a/osx/classes/universe.h +++ b/osx/classes/universe.h @@ -33,6 +33,7 @@ public: //unsigned short template_terrain[64][64]; unsigned long fields[64][64]; + bool special_spot[64][64]; void append(legacy::current_town_type& old,short which_size); void append(legacy::town_item_list& old); @@ -56,7 +57,8 @@ public: bool is_ice_wall(char x, char y) const; bool is_blade_wall(char x, char y) const; bool is_sleep_cloud(char x, char y) const; - bool is_spot(char x, char y) const; // currently unused + bool is_block(char x, char y) const; // currently unused + bool is_spot(char x, char y) const; bool is_special(char x, char y) const; bool is_web(char x, char y) const; bool is_crate(char x, char y) const; @@ -80,7 +82,8 @@ public: bool set_ice_wall(char x, char y, bool b); bool set_blade_wall(char x, char y, bool b); bool set_sleep_cloud(char x, char y, bool b); - bool set_spot(char x, char y, bool b); // currently unused + bool set_block(char x, char y, bool b); // currently unused + bool set_spot(char x, char y, bool b); bool set_special(char x, char y, bool b); bool set_web(char x, char y, bool b); bool set_crate(char x, char y, bool b); diff --git a/osx/tools/fileio.cpp b/osx/tools/fileio.cpp index f9916f5a..42206c91 100644 --- a/osx/tools/fileio.cpp +++ b/osx/tools/fileio.cpp @@ -1125,7 +1125,7 @@ bool load_party(FSSpec file_to_load){ // if ((i == 2) && (flag == flags[i][1])) // maps_there = true; // } - + return true; } bool load_party_v1(FSSpec file_to_load, bool town_restore, bool in_scen, bool maps_there, bool must_port){ @@ -1916,4 +1916,5 @@ bool save_party(FSSpec dest_file) // } // if (in_startup_mode == false) // add_string_to_buf("Save: Game saved. "); + return true; }