Skip to content

Commit

Permalink
Update activities and ini generation
Browse files Browse the repository at this point in the history
  • Loading branch information
Axanery committed Sep 26, 2024
1 parent 44803a2 commit 0a322b5
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
6 changes: 5 additions & 1 deletion source/Engine/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1540,6 +1540,10 @@ PUBLIC STATIC void Application::InitSettings(const char* filename) {
Application::Settings->SetInteger("display", "multisample", 0);
Application::Settings->SetBool("display", "forceSoftwareTextures", false);

Application::Settings->SetInteger("audio", "masterVolume", 0);
Application::Settings->SetInteger("audio", "musicVolume", 0);
Application::Settings->SetInteger("audio", "soundVolume", 0);

Application::Settings->SetBool("dev", "devMenu", false);
Application::Settings->SetBool("dev", "writeToFile", false);
Application::Settings->SetBool("dev", "viewPerformance", false);
Expand All @@ -1559,7 +1563,7 @@ PUBLIC STATIC void Application::InitSettings(const char* filename) {
Application::Settings->SetBool("dev", "viewCollision", false);
Application::Settings->SetBool("dev", "loadAllClasses", false);

Application::Settings->SetBool("compiler", "logLevel", false);
Application::Settings->SetBool("compiler", "log", false);
Application::Settings->SetBool("compiler", "showWarnings", false);
Application::Settings->SetBool("compiler", "writeDebugInfo", false);
Application::Settings->SetBool("compiler", "writeSourceFilename", false);
Expand Down
5 changes: 5 additions & 0 deletions source/Engine/Bytecode/StandardLibrary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18795,6 +18795,11 @@ PUBLIC STATIC void StandardLibrary::Link() {
* \desc Entity updates within a radius. (uses UpdateRegionW)
*/
DEF_ENUM(ACTIVE_RBOUNDS);
/***
* \enum ACTIVE_DISABLED
* \desc Entity will not even reach a point where it would check for an update.
*/
DEF_ENUM(ACTIVE_DISABLED);

// #region Hitbox Sides
/***
Expand Down
2 changes: 1 addition & 1 deletion source/Engine/Scene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ void UpdateObject(Entity* ent) {

switch (ent->Activity) {
default:
break;
case ACTIVE_DISABLED: break;

case ACTIVE_NEVER:
case ACTIVE_PAUSED:
Expand Down
3 changes: 2 additions & 1 deletion source/Engine/Types/EntityTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ enum {
ACTIVE_BOUNDS = 4, // Updates only when the object is within bounds
ACTIVE_XBOUNDS = 5, // Updates within an x bound (not accounting for y bound)
ACTIVE_YBOUNDS = 6, // Updates within a y bound (not accounting for x bound)
ACTIVE_RBOUNDS = 7 // Updates within a radius (UpdateRegionW)
ACTIVE_RBOUNDS = 7, // Updates within a radius (UpdateRegionW)
ACTIVE_DISABLED = 0xFF, // For stopping entities from even checking for an update in some cases
};

namespace CollideSide {
Expand Down

0 comments on commit 0a322b5

Please sign in to comment.