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

Strictify special node type enum

Browse Source
This commit is contained in:
Celtic Minstrel
2014-12-06 22:28:09 -05:00
parent e3af2cce16
commit bfdcfeab58
7 changed files with 480 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
osx/classes/special.cpp
View File

@@ -15,7 +15,7 @@
#include "oldstructs.h"
cSpecial::cSpecial(){
type = 0;
type = eSpecType::NONE;
sd1 = -1;
sd2 = -1;
pic = -1;
@@ -30,13 +30,15 @@ cSpecial::cSpecial(){
}
cSpecial& cSpecial::operator = (legacy::special_node_type& old){
type = old.type;
type = (eSpecType)old.type;
sd1 = old.sd1;
sd2 = old.sd2;
pic = old.pic;
if(type == 55 || type == 58 || type == 189)
// Large dialogs with 36x36 dialog graphics
if(old.type == 55 || old.type == 58 || old.type == 189)
pic -= 700;
else if(type == 57 || type == 60)
// Large dialogs with monster graphics
else if(old.type == 57 || old.type == 60)
pic -= 400;
m1 = old.m1;
m2 = old.m2;
@@ -47,3 +49,17 @@ cSpecial& cSpecial::operator = (legacy::special_node_type& old){
jumpto = old.jumpto;
return *this;
}
std::ostream& operator << (std::ostream& out, eSpecType& e) {
return out << (int) e;
}
// TODO: This should probably understand symbolic names as well?
std::istream& operator >> (std::istream& in, eSpecType& e) {
int i;
in >> i;
e = (eSpecType) i;
if(getNodeCategory(e) == eSpecCat::INVALID)
e = eSpecType::ERROR;
return in;
}