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

Attempt to convert scenarios that used specials on boatable terrains, by inserting a "boat block" special in the front of each such chain

Browse Source 
- This commit also introduces "boat block" and "horse block" specials as part of the IF_CONTEXT special node type.
This commit is contained in:
Celtic Minstrel
2014-12-12 10:46:14 -05:00
parent 24781b335d
commit aabade3b85
8 changed files with 186 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
osx/classes/outdoors.cpp
View File

@@ -11,6 +11,7 @@
#include <map>
#include <sstream>
#include "dlogutil.h"
#include "classes.h"
#include "oldstructs.h"
@@ -18,6 +19,18 @@ extern cScenario scenario;
cOutdoors& cOutdoors::operator = (legacy::outdoor_record_type& old){
int i,j;
// Collect a list of unused special nodes, to be used for fixing specials that could be triggered in a boat.
std::vector<int> unused_special_slots;
for(i = 0; i < 60; i++) {
if(specials[i].type == eSpecType::NONE && specials[i].jumpto == -1) {
// Also make sure no specials jump to it
bool is_free = true;
for(j = 0; j < 60; j++) {
if(specials[j].jumpto == i) is_free = false;
}
if(is_free) unused_special_slots.push_back(i);
}
}
for(i = 0; i < 48; i++)
for(j = 0; j < 48; j++){
terrain[i][j] = old.terrain[i][j];
@@ -51,6 +64,34 @@ cOutdoors& cOutdoors::operator = (legacy::outdoor_record_type& old){
terrain[i][j] = 38;
}
}
if(scenario.ter_types[terrain[i][j]].boat_over) {
// Try to fix specials that could be triggered while in a boat
// (Boats never triggered specials in the old BoE, so we probably don't want them to trigger.)
int found_spec = -1;
for(int k = 0; i < 18; k++) {
if(i == special_locs[k].x && j == special_locs[k].y) {
found_spec = k;
break;
}
}
if(found_spec >= 0) {
if(!unused_special_slots.empty()) {
int found_spec_id = special_id[found_spec], use_slot = unused_special_slots.back();
unused_special_slots.pop_back();
cSpecial& node = specials[use_slot];
node.type = eSpecType::IF_CONTEXT;
node.ex1a = 101; // if in boat
node.ex1c = -1; // do nothing
node.jumpto = found_spec_id; // else jump here
special_id[found_spec] = use_slot;
} else {
std::stringstream sout;
sout << "In outdoor section (" << x << ',' << y << ") at (" << i << ',' << j << "); special node ID ";
sout << special_id[found_spec];
giveError("Warning: A special node was found that could be triggered from in a boat, which is probably not what the designer intended. An attempt to fix this has failed because there were not enough unused special nodes.", sout.str());
}
}
}
}
for(i = 0; i < 18; i++){
special_locs[i].x = old.special_locs[i].x;