empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use correct file for rerecord counting

Browse source
This commit is contained in:
Ilari Liusvaara 2013-10-10 02:22:41 +03:00
parent 88dc3f0108
commit 7101af82fa
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/core/rrdata.hpp
View file

@ -6,5 +6,6 @@
extern rrdata_set rrdata;
rrdata_set::instance random_rrdata();
std::string rrdata_filename(const std::string& projectid);
#endif

6
src/core/moviedata.cpp
View file

@ -327,7 +327,7 @@ void do_load_beginning(bool reload) throw(std::bad_alloc, std::runtime_error)
//Negative return.
if(!reload) {
//Force unlazy rrdata.
rrdata.read_base(our_movie.projectid, false);
rrdata.read_base(rrdata_filename(our_movie.projectid), false);
rrdata.add_internal();
} else {
auto ctrldata = our_rom.rtype->controllerconfig(our_movie.settings);
@ -470,7 +470,7 @@ void do_load_state(struct moviefile& _movie, int lmode)
port_type_set& portset = port_type_set::make(ctrldata.ports, ctrldata.portindex());
//Negative return.
rrdata.read_base(_movie.projectid, _movie.lazy_project_create);
rrdata.read_base(rrdata_filename(_movie.projectid), _movie.lazy_project_create);
rrdata.read(_movie.c_rrdata);
rrdata.add_internal();
try {
@ -656,7 +656,7 @@ bool do_load_state(const std::string& filename, int lmode)
void mainloop_restore_state(const std::vector<char>& state, uint64_t secs, uint64_t ssecs)
{
//Force unlazy rrdata.
rrdata.read_base(our_movie.projectid, false);
rrdata.read_base(rrdata_filename(our_movie.projectid), false);
rrdata.add_internal();
our_movie.rtc_second = secs;
our_movie.rtc_subsecond = ssecs;

5
src/core/rrdata.cpp
View file

@ -15,6 +15,11 @@ rrdata_set::instance random_rrdata()
return rrdata_set::instance(get_random_hexstring(2 * RRDATA_BYTES));
}
std::string rrdata_filename(const std::string& projectid)
{
return get_config_path() + "/" + projectid + ".rr";
}
//
// XABCDEFXXXXXXXXX
// 0123456789XXXXXX