Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 00:57:44 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

More fixes

Browse source 
Comment out related deci2 code until networking can be reworked.  Resolved std::exception errors with a temporary fix
This commit is contained in:
doctaweed 2020-08-26 19:34:54 -06:00
parent 2c92c7799b
commit 1dc206edb9
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
game/runtime.cpp
View file

@ -227,7 +227,7 @@ void exec_runtime(int argc, char** argv) {
// step 1: sce library prep
iop::LIBRARY_INIT();
ee::LIBRARY_INIT_sceCd();
ee::LIBRARY_INIT_sceDeci2();
//ee::LIBRARY_INIT_sceDeci2();
ee::LIBRARY_INIT_sceSif();
// step 2: system prep

2
goalc/goos/Object.cpp
View file

@ -151,7 +151,7 @@ bool Object::operator==(const Object& other) const {
}
default:
//throw std::exception("equality not implemented for " + print());
throw std::exception("equality not implemented for");
}
}

9
goalc/goos/Reader.cpp
View file

@ -588,7 +588,7 @@ bool Reader::try_token_as_binary(const Token& tok, Object& obj) {
for (uint32_t i = 2; i < tok.text.size(); i++) {
if (value & (0x8000000000000000)) {
throw std::exception("overflow in binary constant: " + tok.text);
throw std::exception("overflow in binary constant:)");
}
value <<= 1u;
@ -628,7 +628,7 @@ bool Reader::try_token_as_hex(const Token& tok, Object& obj) {
obj = Object::make_integer(v);
return true;
} catch (std::exception& e) {
throw std::exception("The number " + tok.text + " cannot be a hexadecimal constant");
throw std::exception("The number cannot be a hexadecimal constant");
}
}
return false;
@ -662,7 +662,7 @@ bool Reader::try_token_as_integer(const Token& tok, Object& obj) {
obj = Object::make_integer(v);
return true;
} catch (std::exception& e) {
throw std::exception("The number " + tok.text + " cannot be an integer constant");
throw std::exception("The number cannot be an integer constant");
}
}
return false;
@ -697,8 +697,7 @@ bool Reader::try_token_as_char(const Token& tok, Object& obj) {
* Used for reader errors, like "missing close paren" or similar.
*/
void Reader::throw_reader_error(TextStream& here, const std::string& err, int seek_offset) {
throw std::exception("Reader error:\n" + err + "\nat " +
db.get_info_for(here.text, here.seek + seek_offset));
throw std::exception("Reader error at");
}
/*!