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

fix a few compile errors on gcc

Browse Source
This commit is contained in:
UnknownShadow200 2018-06-18 19:27:50 +10:00
parent 8ae11b80a1
commit f20ca0b6e6
12 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ClassicalSharp/2D/Widgets/InputWidget.cs
View File

@ -101,7 +101,7 @@ namespace ClassicalSharp.Gui.Widgets {
/// <summary> Calculates the sizes of each line in the text buffer. </summary>
public void CalculateLineSizes() {
void CalculateLineSizes() {
for (int y = 0; y < lineSizes.Length; y++)
lineSizes[y] = Size.Empty;
lineSizes[0].Width = prefixWidth;
@ -115,7 +115,7 @@ namespace ClassicalSharp.Gui.Widgets {
}
/// <summary> Calculates the location and size of the caret character </summary>
public void UpdateCaret() {
protected void UpdateCaret() {
int maxChars = UsedLines * MaxCharsPerLine;
if (caret >= maxChars) caret = -1;
Text.GetCoords(caret, lines, out caretX, out caretY);

22
src/Client/Builder.c
View File

@ -456,17 +456,6 @@ void Builder_Init(void) {
Builder_Offsets[FACE_YMAX] = EXTCHUNK_SIZE_2;
}
static void Builder_SetDefault(void) {
Builder_StretchXLiquid = NULL;
Builder_StretchX = NULL;
Builder_StretchZ = NULL;
Builder_RenderBlock = NULL;
Builder_UseBitFlags = false;
Builder_PreStretchTiles = Builder_DefaultPreStretchTiles;
Builder_PostStretchTiles = Builder_DefaultPostStretchTiles;
}
void Builder_OnNewMapLoaded(void) {
Builder_SidesLevel = max(0, WorldEnv_SidesHeight);
Builder_EdgeLevel = max(0, WorldEnv_EdgeHeight);
@ -648,6 +637,17 @@ static void NormalBuilder_RenderBlock(Int32 index) {
}
}
static void Builder_SetDefault(void) {
Builder_StretchXLiquid = NULL;
Builder_StretchX = NULL;
Builder_StretchZ = NULL;
Builder_RenderBlock = NULL;
Builder_UseBitFlags = false;
Builder_PreStretchTiles = Builder_DefaultPreStretchTiles;
Builder_PostStretchTiles = Builder_DefaultPostStretchTiles;
}
void NormalBuilder_SetActive(void) {
Builder_SetDefault();
Builder_StretchXLiquid = NormalBuilder_StretchXLiquid;

1
src/Client/Builder.h
View File

@ -13,7 +13,6 @@ typedef struct ChunkInfo_ ChunkInfo;
Int32 Builder_SidesLevel, Builder_EdgeLevel;
void Builder_Init(void);
void Builder_SetDefault(void);
void Builder_OnNewMapLoaded(void);
void Builder_MakeChunk(ChunkInfo* info);

7
src/Client/Chat.c
View File

@ -442,9 +442,10 @@ static void CuboidCommand_DoCuboid(void) {
BlockID toPlace = (BlockID)cuboid_block;
if (cuboid_block == -1) toPlace = Inventory_SelectedBlock;
for (Int32 y = min.Y; y <= max.Y; y++) {
for (Int32 z = min.Z; z <= max.Z; z++) {
for (Int32 x = min.X; x <= max.X; x++) {
Int32 x, y, z;
for (y = min.Y; y <= max.Y; y++) {
for (z = min.Z; z <= max.Z; z++) {
for (x = min.X; x <= max.X; x++) {
Game_UpdateBlock(x, y, z, toPlace);
}
}

2
src/Client/Deflate.c
View File

@ -415,7 +415,7 @@ static void Inflate_InflateFast(InflateState* state) {
}
}
static void Inflate_Process(InflateState* state) {
void Inflate_Process(InflateState* state) {
for (;;) {
switch (state->State) {
case INFLATE_STATE_HEADER: {

8
src/Client/Game.c
View File

@ -45,14 +45,14 @@ ScheduledTask Game_Tasks[6];
Int32 Game_TasksCount, entTaskI;
UInt8 Game_UsernameBuffer[String_BufferSize(STRING_SIZE)];
extern String Game_Username = String_FromEmptyArray(Game_UsernameBuffer);
String Game_Username = String_FromEmptyArray(Game_UsernameBuffer);
UInt8 Game_MppassBuffer[String_BufferSize(STRING_SIZE)];
extern String Game_Mppass = String_FromEmptyArray(Game_MppassBuffer);
String Game_Mppass = String_FromEmptyArray(Game_MppassBuffer);
UInt8 Game_IPAddressBuffer[String_BufferSize(STRING_SIZE)];
extern String Game_IPAddress = String_FromEmptyArray(Game_IPAddressBuffer);
String Game_IPAddress = String_FromEmptyArray(Game_IPAddressBuffer);
UInt8 Game_FontNameBuffer[String_BufferSize(STRING_SIZE)];
extern String Game_FontName = String_FromEmptyArray(Game_FontNameBuffer);
String Game_FontName = String_FromEmptyArray(Game_FontNameBuffer);
void Game_AddComponent(IGameComponent* comp) {
if (Game_ComponentsCount == Array_Elems(Game_Components)) {

1
src/Client/Gui.c
View File

@ -10,6 +10,7 @@
#include "Camera.h"
#include "InputHandler.h"
#include "ErrorHandler.h"
#include "Platform.h"
Screen* Gui_Status;
void GuiElement_Recreate(GuiElement* elem) {

4
src/Client/Screens.c
View File

@ -253,7 +253,7 @@ Screen* InventoryScreen_MakeInstance(void) {
screen->VTABLE->Free = InventoryScreen_Free;
return (Screen*)screen;
}
extern Screen* InventoryScreen_UNSAFE_RawPointer = (Screen*)&InventoryScreen_Instance;
Screen* InventoryScreen_UNSAFE_RawPointer = (Screen*)&InventoryScreen_Instance;
/*########################################################################################################################*
@ -618,7 +618,7 @@ Screen* LoadingScreen_MakeInstance(STRING_PURE String* title, STRING_PURE String
LoadingScreen_Make(screen, &LoadingScreen_VTABLE, title, message);
return (Screen*)screen;
}
extern Screen* LoadingScreen_UNSAFE_RawPointer = (Screen*)&LoadingScreen_Instance;
Screen* LoadingScreen_UNSAFE_RawPointer = (Screen*)&LoadingScreen_Instance;
/*########################################################################################################################*

14
src/Client/Widgets.c
View File

@ -214,6 +214,12 @@ PackedCol Scroll_HoverCol = PACKEDCOL_CONST(122, 122, 122, 220);
static void ScrollbarWidget_Init(GuiElement* elem) { }
static void ScrollbarWidget_Free(GuiElement* elem) { }
static void ScrollbarWidget_ClampScrollY(ScrollbarWidget* widget) {
Int32 maxRows = widget->TotalRows - TABLE_MAX_ROWS_DISPLAYED;
if (widget->ScrollY >= maxRows) widget->ScrollY = maxRows;
if (widget->ScrollY < 0) widget->ScrollY = 0;
}
static Real32 ScrollbarWidget_GetScale(ScrollbarWidget* widget) {
Real32 rows = (Real32)widget->TotalRows;
return (widget->Height - SCROLL_BORDER * 2) / rows;
@ -319,12 +325,6 @@ void ScrollbarWidget_Create(ScrollbarWidget* widget) {
widget->MouseOffset = 0;
}
static void ScrollbarWidget_ClampScrollY(ScrollbarWidget* widget) {
Int32 maxRows = widget->TotalRows - TABLE_MAX_ROWS_DISPLAYED;
if (widget->ScrollY >= maxRows) widget->ScrollY = maxRows;
if (widget->ScrollY < 0) widget->ScrollY = 0;
}
/*########################################################################################################################*
*------------------------------------------------------HotbarWidget-------------------------------------------------------*
@ -1055,7 +1055,7 @@ void InputWidget_AppendString(InputWidget* widget, STRING_PURE String* text) {
Elem_Recreate(widget);
}
static void InputWidget_Append(InputWidget* widget, UInt8 c) {
void InputWidget_Append(InputWidget* widget, UInt8 c) {
if (!InputWidget_TryAppendChar(widget, c)) return;
Elem_Recreate(widget);
}

7
src/Client/Widgets.h
View File

@ -52,7 +52,6 @@ typedef struct ScrollbarWidget_ {
} ScrollbarWidget;
void ScrollbarWidget_Create(ScrollbarWidget* widget);
void ScrollbarWidget_ClampScrollY(ScrollbarWidget* widget);
typedef struct HotbarWidget_ {
@ -118,10 +117,6 @@ typedef struct InputWidget_ {
} InputWidget;
void InputWidget_Create(InputWidget* widget, FontDesc* font, STRING_REF String* prefix);
/* Calculates the sizes of each line in the text buffer. */
void InputWidget_CalculateLineSizes(InputWidget* widget);
/* Calculates the location and size of the caret character. */
void InputWidget_UpdateCaret(InputWidget* widget);
/* Clears all the characters from the text buffer. Deletes the native texture. */
void InputWidget_Clear(InputWidget* widget);
/* Appends a sequence of characters to current text buffer. May recreate the native texture. */
@ -213,8 +208,6 @@ typedef struct SpecialInputTab_ {
Size2D TitleSize;
String Title, Contents;
} SpecialInputTab;
void SpecialInputTab_Init(SpecialInputTab* tab, STRING_REF String* title,
Int32 itemsPerRow, Int32 charsPerItem, STRING_REF String* contents);
typedef struct SpecialInputWidget_ {
Widget_Layout

1
src/Client/WinWindow.c
View File

@ -170,7 +170,6 @@ static LRESULT CALLBACK Window_Procedure(HWND handle, UINT message, WPARAM wPara
bool new_focused_state;
Real32 wheel_delta;
WORD mouse_x, mouse_y;
MouseButton btn;
WINDOWPOS* pos;
UInt8 new_state;
UInt8 keyChar;

12
src/Client/World.c
View File

@ -84,13 +84,13 @@ if (!PackedCol_Equals(src, dst)) { dst = src; Event_RaiseInt(&WorldEvents_EnvVar
const UInt8* Weather_Names[3] = { "Sunny", "Rainy", "Snowy" };
extern PackedCol WorldEnv_DefaultSkyCol = PACKEDCOL_CONST(0x99, 0xCC, 0xFF, 0xFF);
extern PackedCol WorldEnv_DefaultFogCol = PACKEDCOL_CONST(0xFF, 0xFF, 0xFF, 0xFF);
extern PackedCol WorldEnv_DefaultCloudsCol = PACKEDCOL_CONST(0xFF, 0xFF, 0xFF, 0xFF);
extern PackedCol WorldEnv_DefaultSunCol = PACKEDCOL_CONST(0xFF, 0xFF, 0xFF, 0xFF);
extern PackedCol WorldEnv_DefaultShadowCol = PACKEDCOL_CONST(0x9B, 0x9B, 0x9B, 0xFF);
PackedCol WorldEnv_DefaultSkyCol = PACKEDCOL_CONST(0x99, 0xCC, 0xFF, 0xFF);
PackedCol WorldEnv_DefaultFogCol = PACKEDCOL_CONST(0xFF, 0xFF, 0xFF, 0xFF);
PackedCol WorldEnv_DefaultCloudsCol = PACKEDCOL_CONST(0xFF, 0xFF, 0xFF, 0xFF);
PackedCol WorldEnv_DefaultSunCol = PACKEDCOL_CONST(0xFF, 0xFF, 0xFF, 0xFF);
PackedCol WorldEnv_DefaultShadowCol = PACKEDCOL_CONST(0x9B, 0x9B, 0x9B, 0xFF);
UInt8 World_TextureUrlBuffer[String_BufferSize(STRING_SIZE)];
extern String World_TextureUrl = String_FromEmptyArray(World_TextureUrlBuffer);
String World_TextureUrl = String_FromEmptyArray(World_TextureUrlBuffer);
void WorldEnv_Reset(void) {
WorldEnv_EdgeHeight = -1;