mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

load/save stuff is now in namespace scores

This commit is contained in:
Zeno Rogue 2020-03-27 20:05:58 +01:00
parent 63c9cc1060
commit 67f64e2d91
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inventory.cpp
View File

@ -673,7 +673,7 @@ EX namespace inv {
#if CAP_SAVE #if CAP_SAVE
EX void applyBox(eItem it) { EX void applyBox(eItem it) {
applyBoxNum(usedup[it]); scores::applyBoxNum(inv::usedup[it]);
} }
#endif #endif

17
system.cpp
View File

@ -386,6 +386,9 @@ bool havesave = true;
#if CAP_SAVE #if CAP_SAVE
/** a namespace for loading and saving scores and saved games */
EX namespace scores {
#if HDR #if HDR
#define MAXBOX 500 #define MAXBOX 500
#define POSSCORE 384 // update this when new boxes are added! #define POSSCORE 384 // update this when new boxes are added!
@ -872,6 +875,8 @@ void loadBoxHigh() {
} }
} }
EX }
// certify that saves and achievements were received // certify that saves and achievements were received
// in an official version of HyperRogue // in an official version of HyperRogue
@ -887,7 +892,7 @@ EX }
EX namespace anticheat { EX namespace anticheat {
EX bool tampered; EX bool tampered;
void save(FILE *f) {} void save(FILE *f) {}
bool load(FILE *f, score& sc, const string& ver) {return true; } bool load(FILE *f, scores::score& sc, const string& ver) {return true; }
int certify(const string& s, int a, int b, int c, int d) { return d; } int certify(const string& s, int a, int b, int c, int d) { return d; }
int check(int cv, const string& ver, const string& s, int a, int b, int c, int d=0) { return cv==d; } int check(int cv, const string& ver, const string& s, int a, int b, int c, int d=0) { return cv==d; }
void nextid(int& tid, const string& ver, int cert) { tid++; } void nextid(int& tid, const string& ver, int cert) { tid++; }
@ -987,9 +992,9 @@ EX void saveStats(bool emergency IS(false)) {
if(!shmup::on) kills[moPrincessArmedMoved] = countMyGolems(moPrincessArmed); if(!shmup::on) kills[moPrincessArmedMoved] = countMyGolems(moPrincessArmed);
if(!shmup::on) princess::saveHP = countMyGolemsHP(moPrincess); if(!shmup::on) princess::saveHP = countMyGolemsHP(moPrincess);
if(!shmup::on) princess::saveArmedHP = countMyGolemsHP(moPrincessArmed); if(!shmup::on) princess::saveArmedHP = countMyGolemsHP(moPrincessArmed);
saveBox(); scores::saveBox();
for(int i=0; i<boxid; i++) fprintf(f, " %d", savebox[i]); for(int i=0; i<scores::boxid; i++) fprintf(f, " %d", scores::savebox[i]);
anticheat::save(f); anticheat::save(f);
fprintf(f, "\n"); fprintf(f, "\n");
@ -1040,7 +1045,7 @@ EX void loadsave() {
FILE *f = fopen(scorefile, "rt"); FILE *f = fopen(scorefile, "rt");
havesave = f; havesave = f;
if(!f) return; if(!f) return;
score sc; scores::score sc;
bool ok = false; bool ok = false;
bool tamper = false; bool tamper = false;
int coh = counthints(); int coh = counthints();
@ -1055,10 +1060,11 @@ EX void loadsave() {
ok = true; ok = true;
for(int i=0; i<MAXBOX; i++) { for(int i=0; i<MAXBOX; i++) {
if(fscanf(f, "%d", &sc.box[i]) <= 0) { if(fscanf(f, "%d", &sc.box[i]) <= 0) {
boxid = i; scores::boxid = i;
tamper = anticheat::load(f, sc, sc.ver); tamper = anticheat::load(f, sc, sc.ver);
using namespace scores;
for(int i=0; i<boxid; i++) savebox[i] = sc.box[i]; for(int i=0; i<boxid; i++) savebox[i] = sc.box[i];
for(int i=boxid; i<MAXBOX; i++) savebox[i] = 0, sc.box[i] = 0; for(int i=boxid; i<MAXBOX; i++) savebox[i] = 0, sc.box[i] = 0;
@ -1134,6 +1140,7 @@ EX void loadsave() {
anticheat::tampered = tamper; anticheat::tampered = tamper;
// printf("box = %d (%d)\n", sc.box[65 + 4 + itOrbSafety - itOrbLightning], boxid); // printf("box = %d (%d)\n", sc.box[65 + 4 + itOrbSafety - itOrbLightning], boxid);
// printf("boxid = %d\n", boxid); // printf("boxid = %d\n", boxid);
using namespace scores;
for(int i=0; i<boxid; i++) savebox[i] = sc.box[i]; for(int i=0; i<boxid; i++) savebox[i] = sc.box[i];
for(int i=boxid; i<MAXBOX; i++) savebox[i] = 0; for(int i=boxid; i<MAXBOX; i++) savebox[i] = 0;
// for(int i=160; i<200; i++) printf("%d: %d ", i, savebox[i]); // for(int i=160; i<200; i++) printf("%d: %d ", i, savebox[i]);