AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 11:06:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

add some const and replace some int16_t with short

Browse Source
This commit is contained in:
UnknownShadow200 2019-08-25 16:58:37 +10:00
parent 482df54808
commit 0cf74e9878
11 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Entity.c
View File

@ -20,8 +20,8 @@
#include "Bitmap.h" #include "Bitmap.h"
#include "Logger.h" #include "Logger.h"
const char* NameMode_Names[NAME_MODE_COUNT] = { "None", "Hovered", "All", "AllHovered", "AllUnscaled" }; const char* const NameMode_Names[NAME_MODE_COUNT] = { "None", "Hovered", "All", "AllHovered", "AllUnscaled" };
const char* ShadowMode_Names[SHADOW_MODE_COUNT] = { "None", "SnapToBlock", "Circle", "CircleAll" }; const char* const ShadowMode_Names[SHADOW_MODE_COUNT] = { "None", "SnapToBlock", "Circle", "CircleAll" };
/*########################################################################################################################* /*########################################################################################################################*
*-----------------------------------------------------LocationUpdate------------------------------------------------------* *-----------------------------------------------------LocationUpdate------------------------------------------------------*

4
src/Entity.h
View File

@ -22,12 +22,12 @@ extern struct IGameComponent Entities_Component;
enum NameMode { enum NameMode {
NAME_MODE_NONE, NAME_MODE_HOVERED, NAME_MODE_ALL, NAME_MODE_ALL_HOVERED, NAME_MODE_ALL_UNSCALED, NAME_MODE_COUNT NAME_MODE_NONE, NAME_MODE_HOVERED, NAME_MODE_ALL, NAME_MODE_ALL_HOVERED, NAME_MODE_ALL_UNSCALED, NAME_MODE_COUNT
}; };
extern const char* NameMode_Names[NAME_MODE_COUNT]; extern const char* const NameMode_Names[NAME_MODE_COUNT];
enum ShadowMode { enum ShadowMode {
SHADOW_MODE_NONE, SHADOW_MODE_SNAP_TO_BLOCK, SHADOW_MODE_CIRCLE, SHADOW_MODE_CIRCLE_ALL, SHADOW_MODE_COUNT SHADOW_MODE_NONE, SHADOW_MODE_SNAP_TO_BLOCK, SHADOW_MODE_CIRCLE, SHADOW_MODE_CIRCLE_ALL, SHADOW_MODE_COUNT
}; };
extern const char* ShadowMode_Names[SHADOW_MODE_COUNT]; extern const char* const ShadowMode_Names[SHADOW_MODE_COUNT];
enum EntityType { ENTITY_TYPE_NONE, ENTITY_TYPE_PLAYER }; enum EntityType { ENTITY_TYPE_NONE, ENTITY_TYPE_PLAYER };

8
src/Input.c
View File

@ -23,7 +23,7 @@ bool Key_Pressed[KEY_COUNT];
"K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",\ "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",\
"U", "V", "W", "X", "Y", "Z" "U", "V", "W", "X", "Y", "Z"
const char* Key_Names[KEY_COUNT] = { const char* const Key_Names[KEY_COUNT] = {
"None", "None",
Key_Function_Names, Key_Function_Names,
"ShiftLeft", "ShiftRight", "ControlLeft", "ControlRight", "ShiftLeft", "ShiftRight", "ControlLeft", "ControlRight",
@ -132,7 +132,7 @@ const uint8_t KeyBind_Defaults[KEYBIND_COUNT] = {
KEY_F6, KEY_LALT, KEY_F8, KEY_F6, KEY_LALT, KEY_F8,
'G', KEY_F10, 0 'G', KEY_F10, 0
}; };
const char* KeyBind_Names[KEYBIND_COUNT] = { static const char* const keybindNames[KEYBIND_COUNT] = {
"Forward", "Back", "Left", "Right", "Forward", "Back", "Left", "Right",
"Jump", "Respawn", "SetSpawn", "Chat", "Inventory", "Jump", "Respawn", "SetSpawn", "Chat", "Inventory",
"ToggleFog", "SendChat", "PlayerList", "ToggleFog", "SendChat", "PlayerList",
@ -154,7 +154,7 @@ static void KeyBind_Load(void) {
String_InitArray_NT(name, nameBuffer); String_InitArray_NT(name, nameBuffer);
for (i = 0; i < KEYBIND_COUNT; i++) { for (i = 0; i < KEYBIND_COUNT; i++) {
name.length = 0; name.length = 0;
String_Format1(&name, "key-%c", KeyBind_Names[i]); String_Format1(&name, "key-%c", keybindNames[i]);
name.buffer[name.length] = '\0'; name.buffer[name.length] = '\0';
mapping = Options_GetEnum(name.buffer, KeyBind_Defaults[i], Key_Names, KEY_COUNT); mapping = Options_GetEnum(name.buffer, KeyBind_Defaults[i], Key_Names, KEY_COUNT);
@ -170,7 +170,7 @@ static void KeyBind_Save(void) {
String_InitArray(name, nameBuffer); String_InitArray(name, nameBuffer);
for (i = 0; i < KEYBIND_COUNT; i++) { for (i = 0; i < KEYBIND_COUNT; i++) {
name.length = 0; name.length = 0;
String_Format1(&name, "key-%c", KeyBind_Names[i]); String_Format1(&name, "key-%c", keybindNames[i]);
value = String_FromReadonly(Key_Names[KeyBinds[i]]); value = String_FromReadonly(Key_Names[KeyBinds[i]]);
Options_SetString(&name, &value); Options_SetString(&name, &value);

2
src/Input.h
View File

@ -45,7 +45,7 @@ enum Key_ {
typedef int Key; typedef int Key;
/* Simple names for each keyboard button. */ /* Simple names for each keyboard button. */
extern const char* Key_Names[KEY_COUNT]; extern const char* const Key_Names[KEY_COUNT];
#define Key_IsWinPressed() (Key_Pressed[KEY_LWIN] || Key_Pressed[KEY_RWIN]) #define Key_IsWinPressed() (Key_Pressed[KEY_LWIN] || Key_Pressed[KEY_RWIN])
#define Key_IsAltPressed() (Key_Pressed[KEY_LALT] || Key_Pressed[KEY_RALT]) #define Key_IsAltPressed() (Key_Pressed[KEY_LALT] || Key_Pressed[KEY_RALT])

8
src/InputHandler.c
View File

@ -22,8 +22,8 @@
static bool input_buttonsDown[3]; static bool input_buttonsDown[3];
static int input_pickingId = -1; static int input_pickingId = -1;
static short normViewDists[10] = { 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096 }; static const short normDists[10] = { 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096 };
static short classicViewDists[4] = { 8, 32, 128, 512 }; static const short classicDists[4] = { 8, 32, 128, 512 };
static TimeMS input_lastClick; static TimeMS input_lastClick;
static float input_fovIndex = -1.0f; static float input_fovIndex = -1.0f;
#ifdef CC_BUILD_WEB #ifdef CC_BUILD_WEB
@ -193,8 +193,8 @@ static bool InputHandler_HandleCoreKey(Key key) {
Window_EnterFullscreen(); Window_EnterFullscreen();
} }
} else if (key == KeyBinds[KEYBIND_FOG]) { } else if (key == KeyBinds[KEYBIND_FOG]) {
short* viewDists = Gui_ClassicMenu ? classicViewDists : normViewDists; const short* viewDists = Gui_ClassicMenu ? classicDists : normDists;
int count = Gui_ClassicMenu ? Array_Elems(classicViewDists) : Array_Elems(normViewDists); int count = Gui_ClassicMenu ? Array_Elems(classicDists) : Array_Elems(normDists);
if (Key_IsShiftPressed()) { if (Key_IsShiftPressed()) {
InputHandler_CycleDistanceBackwards(viewDists, count); InputHandler_CycleDistanceBackwards(viewDists, count);

4
src/Program.c
View File

@ -106,8 +106,8 @@ static int Program_Run(int argc, char** argv) {
int argsCount = Platform_GetCommandLineArgs(argc, argv, args); int argsCount = Platform_GetCommandLineArgs(argc, argv, args);
#ifdef _MSC_VER #ifdef _MSC_VER
/* NOTE: Make sure to comment this out before pushing a commit */ /* NOTE: Make sure to comment this out before pushing a commit */
/* String rawArgs = String_FromConst("UnknownShadow200 fffff 127.0.0.1 25565"); */ String rawArgs = String_FromConst("UnknownShadow200 fffff 127.0.0.1 25565");
String rawArgs = String_FromConst("UnknownShadow200"); //String rawArgs = String_FromConst("UnknownShadow200");
argsCount = String_UNSAFE_Split(&rawArgs, ' ', args, 4); argsCount = String_UNSAFE_Split(&rawArgs, ' ', args, 4);
#endif #endif

2
src/Protocol.c
View File

@ -717,7 +717,7 @@ static void Classic_Tick(void) {
/*########################################################################################################################* /*########################################################################################################################*
*------------------------------------------------------CPE protocol-------------------------------------------------------* *------------------------------------------------------CPE protocol-------------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
const char* cpe_clientExtensions[31] = { static const char* cpe_clientExtensions[31] = {
"ClickDistance", "CustomBlocks", "HeldBlock", "EmoteFix", "TextHotKey", "ExtPlayerList", "ClickDistance", "CustomBlocks", "HeldBlock", "EmoteFix", "TextHotKey", "ExtPlayerList",
"EnvColors", "SelectionCuboid", "BlockPermissions", "ChangeModel", "EnvMapAppearance", "EnvColors", "SelectionCuboid", "BlockPermissions", "ChangeModel", "EnvMapAppearance",
"EnvWeatherType", "MessageTypes", "HackControl", "PlayerClick", "FullCP437", "LongerMessages", "EnvWeatherType", "MessageTypes", "HackControl", "PlayerClick", "FullCP437", "LongerMessages",

4
src/Resources.c
View File

@ -24,7 +24,7 @@
static struct ResourceFile { static struct ResourceFile {
const char* name; const char* name;
const char* url; const char* url;
uint16_t size; short size;
bool downloaded; bool downloaded;
/* downloaded archive */ /* downloaded archive */
uint8_t* data; uint32_t len; uint8_t* data; uint32_t len;
@ -90,7 +90,7 @@ static const struct ResourceSound {
static struct ResourceMusic { static struct ResourceMusic {
const char* name; const char* name;
const char* hash; const char* hash;
uint16_t size; short size;
bool downloaded; bool downloaded;
} musicResources[7] = { } musicResources[7] = {
{ "calm1.ogg", "50a59a4f56e4046701b758ddbb1c1587efa4cadf", 2472 }, { "calm1.ogg", "50a59a4f56e4046701b758ddbb1c1587efa4cadf", 2472 },

2
src/Vorbis.c
View File

@ -478,7 +478,7 @@ static void Floor_SortXList(int left, int right) {
} }
static ReturnCode Floor_DecodeSetup(struct VorbisState* ctx, struct Floor* f) { static ReturnCode Floor_DecodeSetup(struct VorbisState* ctx, struct Floor* f) {
static int16_t ranges[4] = { 256, 128, 84, 64 }; static const short ranges[4] = { 256, 128, 84, 64 };
int i, j, idx, maxClass; int i, j, idx, maxClass;
int rangeBits, classNum; int rangeBits, classNum;
int16_t xlist_sorted[FLOOR_MAX_VALUES]; int16_t xlist_sorted[FLOOR_MAX_VALUES];

2
src/World.c
View File

@ -124,7 +124,7 @@ if (src != dst) { dst = src; Event_RaiseInt(&WorldEvents.EnvVarChanged, var); }
if (!PackedCol_Equals(src, dst)) { dst = src; Event_RaiseInt(&WorldEvents.EnvVarChanged, var); } if (!PackedCol_Equals(src, dst)) { dst = src; Event_RaiseInt(&WorldEvents.EnvVarChanged, var); }
struct _EnvData Env; struct _EnvData Env;
const char* Weather_Names[3] = { "Sunny", "Rainy", "Snowy" }; const char* const Weather_Names[3] = { "Sunny", "Rainy", "Snowy" };
const PackedCol Env_DefaultSkyCol = PACKEDCOL_CONST(0x99, 0xCC, 0xFF, 0xFF); const PackedCol Env_DefaultSkyCol = PACKEDCOL_CONST(0x99, 0xCC, 0xFF, 0xFF);
const PackedCol Env_DefaultFogCol = PACKEDCOL_CONST(0xFF, 0xFF, 0xFF, 0xFF); const PackedCol Env_DefaultFogCol = PACKEDCOL_CONST(0xFF, 0xFF, 0xFF, 0xFF);

2
src/World.h
View File

@ -113,7 +113,7 @@ CC_VAR extern struct _EnvData {
#define Env_SidesHeight (Env.EdgeHeight + Env.SidesOffset) #define Env_SidesHeight (Env.EdgeHeight + Env.SidesOffset)
enum Weather_ { WEATHER_SUNNY, WEATHER_RAINY, WEATHER_SNOWY }; enum Weather_ { WEATHER_SUNNY, WEATHER_RAINY, WEATHER_SNOWY };
extern const char* Weather_Names[3]; extern const char* const Weather_Names[3];
extern const PackedCol Env_DefaultSkyCol, Env_DefaultFogCol, Env_DefaultCloudsCol, Env_DefaultSkyboxCol; extern const PackedCol Env_DefaultSkyCol, Env_DefaultFogCol, Env_DefaultCloudsCol, Env_DefaultSkyboxCol;
extern const PackedCol Env_DefaultSunCol, Env_DefaultShadowCol; extern const PackedCol Env_DefaultSunCol, Env_DefaultShadowCol;