change parameters.

vagra · Mar 26, 2023 · c5055a4 · c5055a4
1 parent fb7dbd4
commit c5055a4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/battle/globals.h b/battle/globals.h
@@ -12,7 +12,7 @@
 constexpr int INIT_WIDTH = 1600;
 constexpr int INIT_HEIGHT = 800;
 
-constexpr int ACTORS = 2000;
+constexpr int ACTORS = 3000;
 constexpr int ACTOR_TYPES = 8;
 constexpr int ACTIONS = 12;
 constexpr int ROW_ACTIONS = ACTIONS;

diff --git a/dgrid/globals.h b/dgrid/globals.h
@@ -9,7 +9,7 @@
 constexpr int INIT_WIDTH = 1600;
 constexpr int INIT_HEIGHT = 800;
 
-constexpr int ACTORS = 1000;
+constexpr int ACTORS = 3000;
 constexpr int ACTOR_TYPES = 4;
 constexpr int ACTIONS = 1;
 constexpr int ROW_ACTIONS = 1;

diff --git a/soldier/globals.h b/soldier/globals.h
@@ -9,7 +9,7 @@
 constexpr int INIT_WIDTH = 1600;
 constexpr int INIT_HEIGHT = 800;
 
-constexpr int ACTORS = 1000;
+constexpr int ACTORS = 3000;
 constexpr int ACTOR_TYPES = 6;
 constexpr int ACTIONS = 8;
 constexpr int ROW_ACTIONS = 4;

diff --git a/ugrid/globals.h b/ugrid/globals.h
@@ -9,7 +9,7 @@
 constexpr int INIT_WIDTH = 1600;
 constexpr int INIT_HEIGHT = 800;
 
-constexpr int ACTORS = 2000;
+constexpr int ACTORS = 3000;
 constexpr int ACTOR_TYPES = 4;
 constexpr int ACTIONS = 1;
 constexpr int ROW_ACTIONS = 1;

diff --git a/world/Sorter.cpp b/world/Sorter.cpp
@@ -100,13 +100,13 @@ void Sorter::moveTo(Hero* hero, int row) {
 int Sorter::getRow(const Hero* hero) {
 	const int row = narrow_cast<int>(hero->position.y / ROW_HEIGHT);
 
-	return min(ROWS - 1, row);
+	return max(0, min(ROWS - 1, row));
 }
 
 int Sorter::getPrevRow(const Hero* hero) {
 	const int row = narrow_cast<int>(hero->prev_position.y / ROW_HEIGHT);
 
-	return min(ROWS - 1, row);
+	return max(0, min(ROWS - 1, row));
 }
 
 void Sorter::print() {

diff --git a/world/Sorter.h b/world/Sorter.h
@@ -4,8 +4,8 @@
 #include "../common/ActorManager.h"
 #include "Hero.h"
 
-constexpr int ROW_HEIGHT = 20;
-constexpr int ROWS = 60;
+constexpr int ROW_HEIGHT = 10;
+constexpr int ROWS = 120;
 
 class Hero;
 

diff --git a/world/globals.h b/world/globals.h
@@ -6,7 +6,7 @@
 constexpr int INIT_WIDTH = 1600;
 constexpr int INIT_HEIGHT = 800;
 
-constexpr int ACTORS = 5000;
+constexpr int ACTORS = 3000;
 constexpr int ACTOR_TYPES = 17;
 constexpr int ACTIONS = 3;
 constexpr int ROW_ACTIONS = 3;