Permalink
Browse files

fix compile errors

  • Loading branch information...
UnknownShadow200 committed Dec 2, 2018
1 parent 40cadd9 commit 1d04d007525cc051dd371a93993ba3c05af90df3
Showing with 18 additions and 9 deletions.
  1. +5 −5 src/LScreens.c
  2. +1 −1 src/LScreens.h
  3. +2 −2 src/LWeb.c
  4. +10 −1 src/Launcher.c
@@ -111,6 +111,11 @@ static void SettingsScreen_InitWidgets(struct SettingsScreen* s) {
LScreen_Button(s_, &s->BtnBack, 80, 35, "Back",
ANCHOR_CENTRE, ANCHOR_CENTRE, 0, 170);
s->BtnMode.OnClick = SwitchToChooseMode;
s->BtnUpdates.OnClick = SwitchToUpdates;
s->BtnColours.OnClick = SwitchToColours;
s->BtnBack.OnClick = SwitchToMain;
}
static void SwitchToChooseMode(void* w, int x, int y) {
@@ -132,11 +137,6 @@ static void SettingsScreen_Init(struct LScreen* s_) {
s->BtnColours.Hidden = Launcher_ClassicBackground;
s->LblColours.Hidden = Launcher_ClassicBackground;
s->BtnMode.OnClick = SwitchToChooseMode;
s->BtnUpdates.OnClick = SwitchToUpdates;
s->BtnColours.OnClick = SwitchToColours;
s->BtnBack.OnClick = SwitchToMain;
s->DrawAll(s);
}
@@ -30,7 +30,7 @@ struct LScreen {
struct LWidget** Widgets;
};
struct LScreen* ChooseModeScreen_MakeInstance(void);
struct LScreen* ChooseModeScreen_MakeInstance(bool firstTime);
struct LScreen* ColoursScreen_MakeInstance(void);
struct LScreen* DirectConnectScreen_MakeInstance(void);
struct LScreen* MainScreen_MakeInstance(void);
@@ -29,8 +29,8 @@ void LWebTask_Tick(struct LWebTask* task) {
static void LWebTask_DefaultBegin(struct LWebTask* task) {
AsyncDownloader_GetData(&task->URL, false, &task->Identifier);
}
/*protected static JsonObject ParseJson(Request req) {
/*
protected static JsonObject ParseJson(Request req) {
JsonContext ctx = new JsonContext();
ctx.Val = (string)req.Data;
return (JsonObject)Json.ParseStream(ctx);
@@ -13,14 +13,23 @@ bool Launcher_Dirty, Launcher_PendingRedraw;
Rect2D Launcher_DirtyArea;
Bitmap Launcher_Framebuffer;
bool Launcher_ClassicBackground;
FontDesc Launcher_TitleFont, Launcher_TextFont;
bool Launcher_ShouldExit, Launcher_ShouldUpdate;
TimeMS Launcher_PatchTime;
struct ServerListEntry* Launcher_PublicServers;
int Launcher_NumServers;
void Launcher_ShowError(ReturnCode res, const char* place) {
String msg; char msgBuffer[STRING_SIZE * 2];
String_InitArray_NT(msg, msgBuffer);
String_Format2(&msg, "Error %x when %c", &res, place);
msg.buffer[msg.length] = '\0';
Window_ShowDialog("Error", msg.buffer);
}
/* TODO: FIX THESE STUBS!!! */
void Launcher_ShowError(ReturnCode res, const char* place) { }
void Launcher_SecureSetOpt(const char* opt, const String* data, const String* key) { }
/*internal UpdateCheckTask checkTask;

0 comments on commit 1d04d00

Please sign in to comment.