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

Really fix the talking crash this time, I'm pretty sure

Browse Source
This commit is contained in:
Celtic Minstrel
2014-04-18 01:19:13 -04:00
parent 14fe8fcd7b
commit dca3c3c18f
10 changed files with 67 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osx/tools/fileio.cpp
View File

@@ -337,15 +337,8 @@ bool load_town(short which_town, cTown*& the_town){
return true;
}
bool load_town(short which_town, cSpeech*& the_talk){
if(which_town == univ.town.cur_talk_loaded) return true;
if(univ.town.num != univ.town.cur_talk_loaded) delete the_talk;
univ.town.cur_talk_loaded = which_town;
if(which_town == univ.town.num) {
the_talk = &univ.town->talking;
return true;
}
the_talk = new cSpeech;
bool load_town_talk(short which_town){
if(univ.town.prep_talk(which_town)) return true;
short i,n;
long len,len_to_jump = 0;
@@ -411,12 +404,13 @@ bool load_town(short which_town, cSpeech*& the_talk){
return false;
}
port_talk_nodes(&store_talk);
*the_talk = store_talk;
cSpeech& the_talk = univ.town.cur_talk();
the_talk = store_talk;
for (i = 0; i < 170; i++) {
len = (long) (the_talk->strlens[i]);
n = fread(&(the_talk->talk_strs[i]), len, 1, file_id);
the_talk->talk_strs[i][len] = 0;
len = (long) (the_talk.strlens[i]);
n = fread(&(the_talk.talk_strs[i]), len, 1, file_id);
the_talk.talk_strs[i][len] = 0;
}
// town_type = scenario.town_size[which_town];