Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select

1 files changed, 4 insertions, 2 deletions

diff --git a/src/levelinfo.cpp b/src/levelinfo.cpp
index 3a0ef6f..8ce2845 100644
--- a/src/levelinfo.cpp
+++ b/src/levelinfo.cpp
@@ -12,6 +12,8 @@ void dLevelInfo_c::load(void *buffer) {
 		for (int lev = 0; lev < thisSect->levelCount; lev++) {

 			entry_s *level = &levels[lev];

 

+			SetSomeConditionShit(level->worldSlot, level->levelSlot, level->flags);

+

 			char *name = (char*)getNameForLevel(level);

 

 			for (int i = 0; i < level->nameLength+1; i++) {

@@ -21,13 +23,13 @@ void dLevelInfo_c::load(void *buffer) {
 	}

 }

 

-dLevelInfo_c::entry_s *dLevelInfo_c::search(int world, int level) {

+dLevelInfo_c::entry_s *dLevelInfo_c::searchBySlot(int world, int level) {

 	for (int i = 0; i < sectionCount(); i++) {

 		section_s *sect = getSectionByIndex(i);

 

 		for (int j = 0; j < sect->levelCount; j++) {

 			entry_s *entry = &getLevelsForSection(sect)[j];

-			if (entry->world == world && entry->level == level)

+			if (entry->worldSlot == world && entry->levelSlot == level)

 				return entry;

 		}

 	}