From a485f4c6afe8f91f8a326c0b8cf8e4eb9fa27799 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Fri, 8 Jan 2021 23:39:33 +1100 Subject: [PATCH] Webclient: Start using placeholder text for mobile on-screen keyboard in a few places Also bump copyright to 2021 --- src/Animations.h | 2 +- src/Audio.h | 2 +- src/AxisLinesRenderer.h | 2 +- src/Bitmap.h | 2 +- src/Block.h | 2 +- src/BlockID.h | 2 +- src/BlockPhysics.h | 2 +- src/Builder.h | 2 +- src/Camera.h | 2 +- src/Chat.h | 2 +- src/Constants.h | 2 +- src/Core.h | 2 +- src/Deflate.h | 2 +- src/Drawer.h | 2 +- src/Drawer2D.h | 2 +- src/Entity.h | 2 +- src/EntityComponents.h | 2 +- src/EnvRenderer.h | 2 +- src/Errors.h | 2 +- src/Event.h | 2 +- src/ExtMath.h | 2 +- src/Formats.h | 2 +- src/Funcs.h | 2 +- src/Game.h | 2 +- src/Generator.h | 2 +- src/Graphics.h | 2 +- src/Gui.h | 2 +- src/HeldBlockRenderer.h | 2 +- src/Http.h | 2 +- src/Input.h | 2 +- src/Inventory.h | 2 +- src/IsometricDrawer.h | 2 +- src/LScreens.h | 2 +- src/LWeb.h | 2 +- src/LWidgets.h | 2 +- src/Launcher.h | 2 +- src/Lighting.h | 2 +- src/Logger.h | 2 +- src/MapRenderer.h | 2 +- src/Menus.c | 4 ++++ src/Menus.h | 2 +- src/Model.h | 2 +- src/Options.h | 2 +- src/PackedCol.h | 2 +- src/Particle.h | 2 +- src/Physics.h | 2 +- src/PickedPosRenderer.h | 2 +- src/Picking.h | 2 +- src/Platform.c | 2 -- src/Platform.h | 2 +- src/Protocol.h | 2 +- src/Resources.h | 2 +- src/Screens.c | 1 + src/Screens.h | 2 +- src/SelectionBox.h | 2 +- src/Server.h | 2 +- src/Stream.h | 2 +- src/String.h | 2 +- src/TexturePack.h | 2 +- src/Utils.h | 2 +- src/Vectors.h | 2 +- src/Vorbis.h | 2 +- src/Widgets.h | 2 +- src/Window.h | 2 +- src/World.h | 2 +- 65 files changed, 67 insertions(+), 64 deletions(-) diff --git a/src/Animations.h b/src/Animations.h index 71e5413fc..dbb742e22 100644 --- a/src/Animations.h +++ b/src/Animations.h @@ -1,7 +1,7 @@ #ifndef CC_ANIMATIONS_H #define CC_ANIMATIONS_H /* Contains everything relating to texture animations (including default water/lava ones) - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; diff --git a/src/Audio.h b/src/Audio.h index 65acc03bb..66a46f746 100644 --- a/src/Audio.h +++ b/src/Audio.h @@ -2,7 +2,7 @@ #define CC_AUDIO_H #include "Core.h" /* Manages playing sound and music. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; extern struct IGameComponent Audio_Component; diff --git a/src/AxisLinesRenderer.h b/src/AxisLinesRenderer.h index bb8f9994f..66b5b78b9 100644 --- a/src/AxisLinesRenderer.h +++ b/src/AxisLinesRenderer.h @@ -2,7 +2,7 @@ #define CC_AXISLINESRENDERER_H #include "Core.h" /* Renders 3 lines showing direction of each axis. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; diff --git a/src/Bitmap.h b/src/Bitmap.h index 3cc349127..e238b50a4 100644 --- a/src/Bitmap.h +++ b/src/Bitmap.h @@ -2,7 +2,7 @@ #define CC_BITMAP_H #include "Core.h" /* Represents a 2D array of pixels. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Stream; diff --git a/src/Block.h b/src/Block.h index 5b3391516..3a15f85f7 100644 --- a/src/Block.h +++ b/src/Block.h @@ -6,7 +6,7 @@ #include "BlockID.h" /* Stores properties and data for blocks. Also performs automatic rotation of directional blocks. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; extern struct IGameComponent Blocks_Component; diff --git a/src/BlockID.h b/src/BlockID.h index e1aad0985..1f118cca0 100644 --- a/src/BlockID.h +++ b/src/BlockID.h @@ -2,7 +2,7 @@ #define CC_BLOCKID_H #include "Core.h" /* TODO: Remove this include when we move to external defines */ /* List of all core/standard block IDs - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ enum BLOCKID { diff --git a/src/BlockPhysics.h b/src/BlockPhysics.h index 4b08f781c..0e749ab5f 100644 --- a/src/BlockPhysics.h +++ b/src/BlockPhysics.h @@ -2,7 +2,7 @@ #define CC_BLOCKPHYSICS_H #include "Core.h" /* Implements simple block physics. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ typedef void (*PhysicsHandler)(int index, BlockID block); diff --git a/src/Builder.h b/src/Builder.h index 29fc3dfc5..90ba377c0 100644 --- a/src/Builder.h +++ b/src/Builder.h @@ -6,7 +6,7 @@ NormalMeshBuilder: Implements a simple chunk mesh builder, where each block face is a single colour. (whatever lighting engine returns as light colour for given block face at given coordinates) -Copyright 2014-2020 ClassiCube | Licensed under BSD-3 +Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct ChunkInfo; struct IGameComponent; diff --git a/src/Camera.h b/src/Camera.h index 0b5413422..0cd67baca 100644 --- a/src/Camera.h +++ b/src/Camera.h @@ -3,7 +3,7 @@ #include "Vectors.h" /* Represents a camera, may be first or third person. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct RayTracer; struct Camera; diff --git a/src/Chat.h b/src/Chat.h index 3d418eb97..3305dd74f 100644 --- a/src/Chat.h +++ b/src/Chat.h @@ -2,7 +2,7 @@ #define CC_CHAT_H #include "Core.h" /* Manages sending, adding, logging and handling chat. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; struct StringsBuffer; diff --git a/src/Constants.h b/src/Constants.h index 75586ddc6..9ff10183a 100644 --- a/src/Constants.h +++ b/src/Constants.h @@ -1,7 +1,7 @@ #ifndef CC_CONSTANTS_H #define CC_CONSTANTS_H /* Defines useful constants. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ #define GAME_MAX_CMDARGS 5 diff --git a/src/Core.h b/src/Core.h index 8529dcc09..a343cf6b7 100644 --- a/src/Core.h +++ b/src/Core.h @@ -1,7 +1,7 @@ #ifndef CC_CORE_H #define CC_CORE_H /* Core fixed-size integer types, automatic platform detection, and common small structs. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ #if _MSC_VER diff --git a/src/Deflate.h b/src/Deflate.h index eddc98e23..f2c1ca06b 100644 --- a/src/Deflate.h +++ b/src/Deflate.h @@ -8,7 +8,7 @@ https://www.ietf.org/rfc/rfc1951.txt https://github.com/nothings/stb/blob/master/stb_image.h https://www.hanshq.net/zip.html - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Stream; diff --git a/src/Drawer.h b/src/Drawer.h index a99a1e01d..4bbd5bfc0 100644 --- a/src/Drawer.h +++ b/src/Drawer.h @@ -3,7 +3,7 @@ #include "PackedCol.h" #include "Vectors.h" /* Draws the vertices for a cuboid region. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct VertexTextured; diff --git a/src/Drawer2D.h b/src/Drawer2D.h index e87f041a9..5a28b825c 100644 --- a/src/Drawer2D.h +++ b/src/Drawer2D.h @@ -4,7 +4,7 @@ #include "Constants.h" #include "Bitmap.h" /* Performs a variety of drawing operations on bitmaps, and converts bitmaps into textures. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ enum FONT_FLAGS { FONT_FLAGS_NONE = 0x00, FONT_FLAGS_BOLD = 0x01, FONT_FLAGS_UNDERLINE = 0x02, FONT_FLAGS_PADDING = 0x04 }; diff --git a/src/Entity.h b/src/Entity.h index bc0a216a5..c6a0ced11 100644 --- a/src/Entity.h +++ b/src/Entity.h @@ -6,7 +6,7 @@ #include "PackedCol.h" #include "String.h" /* Represents an in-game entity. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Model; struct IGameComponent; diff --git a/src/EntityComponents.h b/src/EntityComponents.h index 71f5c6cfa..abf915ee1 100644 --- a/src/EntityComponents.h +++ b/src/EntityComponents.h @@ -3,7 +3,7 @@ #include "Vectors.h" #include "Constants.h" /* Various components for entities. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Entity; diff --git a/src/EnvRenderer.h b/src/EnvRenderer.h index 120e4abf4..2270c137a 100644 --- a/src/EnvRenderer.h +++ b/src/EnvRenderer.h @@ -2,7 +2,7 @@ #define CC_ENVRENDERER_H #include "Core.h" /* Renders environment of the map. (clouds, sky, fog, map sides/edges, skybox, rain/snow) - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; extern struct IGameComponent EnvRenderer_Component; diff --git a/src/Errors.h b/src/Errors.h index 83f1fca99..be5d428bc 100644 --- a/src/Errors.h +++ b/src/Errors.h @@ -1,7 +1,7 @@ #ifndef CC_ERRORS_H #define CC_ERRORS_H /* Represents list of internal errors. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ /* NOTE: When changing these, remember to keep Logger.c up to date! */ diff --git a/src/Event.h b/src/Event.h index 0613f7621..1b4c34c6b 100644 --- a/src/Event.h +++ b/src/Event.h @@ -2,7 +2,7 @@ #define CC_EVENT_H #include "Vectors.h" /* Helper methods for using events, and contains all events. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ /* Max callbacks that can be registered for an event. */ diff --git a/src/ExtMath.h b/src/ExtMath.h index abc14c72c..b0bc94f15 100644 --- a/src/ExtMath.h +++ b/src/ExtMath.h @@ -3,7 +3,7 @@ #include "Core.h" /* Simple math functions and constants. Also implements a RNG algorithm, based on Java's implementation from https://docs.oracle.com/javase/7/docs/api/java/util/Random.html - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ #define MATH_PI 3.1415926535897931f diff --git a/src/Formats.h b/src/Formats.h index 6e8b29e6d..b4ef3c2cb 100644 --- a/src/Formats.h +++ b/src/Formats.h @@ -2,7 +2,7 @@ #define CC_MAPFORMATS_H #include "Core.h" /* Imports/exports a world and associated metadata from/to a particular map file format. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Stream; diff --git a/src/Funcs.h b/src/Funcs.h index 01944ce25..0531f3dfc 100644 --- a/src/Funcs.h +++ b/src/Funcs.h @@ -3,7 +3,7 @@ #include "Core.h" /* Simple function implementations NOTE: doing min(x++, y) etc will increment x twice! - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ #define min(x, y) ((x) < (y) ? (x) : (y)) diff --git a/src/Game.h b/src/Game.h index f3d3ae247..21e2e3f66 100644 --- a/src/Game.h +++ b/src/Game.h @@ -2,7 +2,7 @@ #define CC_GAME_H #include "Core.h" /* Represents the game and related structures. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Bitmap; diff --git a/src/Generator.h b/src/Generator.h index 33201a18a..efb20ae0c 100644 --- a/src/Generator.h +++ b/src/Generator.h @@ -5,7 +5,7 @@ /* Implements flatgrass map generator, and original classic vanilla map generation (with perlin noise) Based on: https://github.com/UnknownShadow200/ClassiCube/wiki/Minecraft-Classic-map-generation-algorithm Thanks to Jerralish for originally reverse engineering classic's algorithm, then preparing a high level overview of the algorithm. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ extern volatile float Gen_CurrentProgress; diff --git a/src/Graphics.h b/src/Graphics.h index fcb95f519..6933e5907 100644 --- a/src/Graphics.h +++ b/src/Graphics.h @@ -4,7 +4,7 @@ #include "PackedCol.h" /* Abstracts a 3D graphics rendering API. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Bitmap; struct Stream; diff --git a/src/Gui.h b/src/Gui.h index d857105e4..23c7ffa61 100644 --- a/src/Gui.h +++ b/src/Gui.h @@ -2,7 +2,7 @@ #define CC_GUI_H #include "Core.h" /* Describes and manages 2D GUI elements on screen. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ enum GuiAnchor { diff --git a/src/HeldBlockRenderer.h b/src/HeldBlockRenderer.h index 3e5145bfc..f30b7c999 100644 --- a/src/HeldBlockRenderer.h +++ b/src/HeldBlockRenderer.h @@ -2,7 +2,7 @@ #define CC_HELDBLOCKRENDERER_H #include "Core.h" /* Implements rendering of held block/arm at bottom right of game. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; extern struct IGameComponent HeldBlockRenderer_Component; diff --git a/src/Http.h b/src/Http.h index e790013ea..ac010f632 100644 --- a/src/Http.h +++ b/src/Http.h @@ -4,7 +4,7 @@ #include "Core.h" /* Aysnchronously performs http GET, HEAD, and POST requests. Typically this is used to download skins, texture packs, etc. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; struct ScheduledTask; diff --git a/src/Input.h b/src/Input.h index 8afde0b68..754066a8e 100644 --- a/src/Input.h +++ b/src/Input.h @@ -3,7 +3,7 @@ #include "Core.h" /* Manages keyboard, mouse, and touch state. Raises events when keys are pressed etc, and implements base handlers for them. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; struct StringsBuffer; diff --git a/src/Inventory.h b/src/Inventory.h index 4a39c7254..16f606266 100644 --- a/src/Inventory.h +++ b/src/Inventory.h @@ -4,7 +4,7 @@ #include "BlockID.h" /* Manages inventory hotbar, and ordering of blocks in the inventory menu. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; extern struct IGameComponent Inventory_Component; diff --git a/src/IsometricDrawer.h b/src/IsometricDrawer.h index 278ec1f2e..4cc3d9d94 100644 --- a/src/IsometricDrawer.h +++ b/src/IsometricDrawer.h @@ -2,7 +2,7 @@ #define CC_ISOMETRICDRAWER_H #include "Core.h" /* Draws 2D isometric blocks for the hotbar and inventory UIs. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct VertexTextured; diff --git a/src/LScreens.h b/src/LScreens.h index 99a76260e..7c21d84fe 100644 --- a/src/LScreens.h +++ b/src/LScreens.h @@ -2,7 +2,7 @@ #define CC_LSCREENS_H #include "Core.h" /* Implements screens/menus for the launcher. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct LWidget; struct LScreen; diff --git a/src/LWeb.h b/src/LWeb.h index e183eb703..aeb83f5d9 100644 --- a/src/LWeb.h +++ b/src/LWeb.h @@ -2,7 +2,7 @@ #define CC_LWEB_H #include "Http.h" /* Implements asynchronous web tasks for the launcher. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct JsonContext; diff --git a/src/LWidgets.h b/src/LWidgets.h index 8f4673578..e87c364ed 100644 --- a/src/LWidgets.h +++ b/src/LWidgets.h @@ -3,7 +3,7 @@ #include "Bitmap.h" #include "Constants.h" /* Describes and manages individual 2D GUI elements in the launcher. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct LScreen; struct FontDesc; diff --git a/src/Launcher.h b/src/Launcher.h index d97ccb742..a1b80661c 100644 --- a/src/Launcher.h +++ b/src/Launcher.h @@ -2,7 +2,7 @@ #define CC_LAUNCHER_H #include "Bitmap.h" /* Implements the launcher part of the game. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct LScreen; struct FontDesc; diff --git a/src/Lighting.h b/src/Lighting.h index 178ea29b2..e9fda74e2 100644 --- a/src/Lighting.h +++ b/src/Lighting.h @@ -3,7 +3,7 @@ #include "PackedCol.h" /* Manages lighting of blocks in the world. BasicLighting: Uses a simple heightmap, where each block is either in sun or shadow. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; extern struct IGameComponent Lighting_Component; diff --git a/src/Logger.h b/src/Logger.h index 8736a125c..4e38c4029 100644 --- a/src/Logger.h +++ b/src/Logger.h @@ -2,7 +2,7 @@ #define CC_LOGGER_H #include "Core.h" /* Support methods for logging errors. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ typedef cc_bool (*Logger_DescribeError)(cc_result res, cc_string* dst); diff --git a/src/MapRenderer.h b/src/MapRenderer.h index 86589c79d..d7fddc9b3 100644 --- a/src/MapRenderer.h +++ b/src/MapRenderer.h @@ -5,7 +5,7 @@ /* Renders the blocks of the world by subdividing it into chunks. Also manages the process of building/deleting chunk meshes. Also sorts chunks so nearest chunks are rendered first, and calculates chunk visibility. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; extern struct IGameComponent MapRenderer_Component; diff --git a/src/Menus.c b/src/Menus.c index 37700e290..0ace8c052 100644 --- a/src/Menus.c +++ b/src/Menus.c @@ -972,7 +972,9 @@ static void EditHotkeyScreen_Init(void* screen) { TextInputWidget_Create(&s->input, 500, &text, &desc); Menu_InitBack(&s->cancel, Menu_SwitchHotkeys); + OpenKeyboardArgs_Init(&args, &text, KEYBOARD_TYPE_TEXT); + args.placeholder = "Hotkey text"; Window_OpenKeyboard(&args); } @@ -1535,7 +1537,9 @@ static void SaveLevelScreen_Init(void* screen) { Menu_InitBack(&s->cancel, Menu_SwitchPause); TextInputWidget_Create(&s->input, 500, &String_Empty, &desc); TextWidget_Init(&s->desc); + OpenKeyboardArgs_Init(&args, &String_Empty, KEYBOARD_TYPE_TEXT); + args.placeholder = "Map name"; Window_OpenKeyboard(&args); } diff --git a/src/Menus.h b/src/Menus.h index 1e94e8d69..5b797a60d 100644 --- a/src/Menus.h +++ b/src/Menus.h @@ -3,7 +3,7 @@ #include "Core.h" /* Contains all 2D menu screen implementations. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Screen; int Menu_PointerDown(void* screen, int id, int x, int y); diff --git a/src/Model.h b/src/Model.h index d5a757ed3..dc9549ddf 100644 --- a/src/Model.h +++ b/src/Model.h @@ -6,7 +6,7 @@ #include "Physics.h" /* Contains various structs and methods for an entity model. Also contains a list of models and default textures for those models. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Entity; struct AABB; diff --git a/src/Options.h b/src/Options.h index cc5ff4fef..9e2de9121 100644 --- a/src/Options.h +++ b/src/Options.h @@ -2,7 +2,7 @@ #define CC_OPTIONS_H #include "Core.h" /* Manages loading and saving options. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ #define OPT_USE_MUSIC "usemusic" diff --git a/src/PackedCol.h b/src/PackedCol.h index aaad97c2d..728533bca 100644 --- a/src/PackedCol.h +++ b/src/PackedCol.h @@ -2,7 +2,7 @@ #define CC_PACKEDCOL_H #include "Core.h" /* Manipulates a packed 32 bit RGBA colour, in a format suitable for the native 3D graphics API. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ typedef cc_uint32 PackedCol; diff --git a/src/Particle.h b/src/Particle.h index 83384df62..88cb3fff3 100644 --- a/src/Particle.h +++ b/src/Particle.h @@ -3,7 +3,7 @@ #include "Vectors.h" #include "PackedCol.h" /* Represents particle effects, and manages rendering and spawning particles. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; diff --git a/src/Physics.h b/src/Physics.h index 39a8deda0..afb77319a 100644 --- a/src/Physics.h +++ b/src/Physics.h @@ -5,7 +5,7 @@ - An axis aligned bounding box, and various methods related to them. - Various methods for intersecting geometry. - Calculates all possible blocks that a moving entity can intersect with. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Entity; diff --git a/src/PickedPosRenderer.h b/src/PickedPosRenderer.h index 52923c106..4a9951f62 100644 --- a/src/PickedPosRenderer.h +++ b/src/PickedPosRenderer.h @@ -2,7 +2,7 @@ #define CC_PICKEDPOSRENDERER_H #include "Core.h" /* Renders an outline around the block the player is looking at. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct RayTracer; struct IGameComponent; diff --git a/src/Picking.h b/src/Picking.h index a07e0b8bd..4e2a540f1 100644 --- a/src/Picking.h +++ b/src/Picking.h @@ -2,7 +2,7 @@ #define CC_PICKING_H #include "Vectors.h" /* Data for picking/selecting block by the user, and clipping the camera. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ /* Implements a voxel ray tracer diff --git a/src/Platform.c b/src/Platform.c index 479045108..231497ceb 100644 --- a/src/Platform.c +++ b/src/Platform.c @@ -918,8 +918,6 @@ cc_result Socket_Connect(cc_socket s, const cc_string* ip, int port) { Stream_SetU16_BE( (cc_uint8*)&addr.sa_data[0], port); Utils_ParseIP(ip, (cc_uint8*)&addr.sa_data[2]); - WSAStringToAddress() - res = connect(s, &addr, sizeof(addr)); return res == -1 ? Socket__Error() : 0; } diff --git a/src/Platform.h b/src/Platform.h index be5a9e35c..322faf53f 100644 --- a/src/Platform.h +++ b/src/Platform.h @@ -2,7 +2,7 @@ #define CC_PLATFORM_H #include "Core.h" /* Abstracts platform specific memory management, I/O, etc. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct DateTime; diff --git a/src/Protocol.h b/src/Protocol.h index fde51dea7..90388b39d 100644 --- a/src/Protocol.h +++ b/src/Protocol.h @@ -2,7 +2,7 @@ #define CC_PROTOCOL_H #include "Vectors.h" /* Implements network protocols for original classic, CPE, and WoM textures. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct RayTracer; diff --git a/src/Resources.h b/src/Resources.h index 8339195c7..b0a86b913 100644 --- a/src/Resources.h +++ b/src/Resources.h @@ -2,7 +2,7 @@ #define CC_RESOURCES_H #include "Core.h" /* Implements checking, fetching, and patching the default game assets. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ /* Number of resources that need to be downloaded. */ diff --git a/src/Screens.c b/src/Screens.c index d40554939..c1e10538e 100644 --- a/src/Screens.c +++ b/src/Screens.c @@ -1313,6 +1313,7 @@ void ChatScreen_OpenInput(const cc_string* text) { Gui_UpdateInputGrab(); OpenKeyboardArgs_Init(&args, text, KEYBOARD_TYPE_TEXT); + args.placeholder = "Enter chat"; Window_OpenKeyboard(&args); String_Copy(&s->input.base.text, text); diff --git a/src/Screens.h b/src/Screens.h index 5242c9a26..877e76a2c 100644 --- a/src/Screens.h +++ b/src/Screens.h @@ -2,7 +2,7 @@ #define CC_SCREENS_H #include "Core.h" /* Contains all 2D non-menu screen implementations. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Screen; diff --git a/src/SelectionBox.h b/src/SelectionBox.h index 307ce2514..55a0ab764 100644 --- a/src/SelectionBox.h +++ b/src/SelectionBox.h @@ -3,7 +3,7 @@ #include "Vectors.h" #include "PackedCol.h" /* Describes a selection box, and contains methods related to the selection box. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; extern struct IGameComponent Selections_Component; diff --git a/src/Server.h b/src/Server.h index f48e7be9b..4b104a675 100644 --- a/src/Server.h +++ b/src/Server.h @@ -2,7 +2,7 @@ #define CC_SERVERCONNECTION_H #include "Vectors.h" /* Represents a connection to either a multiplayer or an internal singleplayer server. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; diff --git a/src/Stream.h b/src/Stream.h index 0c8209c49..74dccc761 100644 --- a/src/Stream.h +++ b/src/Stream.h @@ -4,7 +4,7 @@ #include "Platform.h" /* Defines an abstract way of reading and writing data in a streaming manner. Also provides common helper methods for reading/writing data to/from streams. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Stream; diff --git a/src/String.h b/src/String.h index c866b685f..82d57262f 100644 --- a/src/String.h +++ b/src/String.h @@ -5,7 +5,7 @@ Also implements conversions betweens strings and numbers. Also implements converting code page 437 indices to/from unicode. Also implements wrapping a single line of text into multiple lines. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ #define STRING_INT_CHARS 24 diff --git a/src/TexturePack.h b/src/TexturePack.h index 240c4843e..39e94d58f 100644 --- a/src/TexturePack.h +++ b/src/TexturePack.h @@ -5,7 +5,7 @@ - Extracting the textures from a .zip archive - Caching terrain atlases and texture packs to avoid redundant downloads - Terrain atlas (including breaking it down into multiple 1D atlases) - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Stream; diff --git a/src/Utils.h b/src/Utils.h index f02fd48c4..b76f96df6 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -2,7 +2,7 @@ #define CC_UTILS_H #include "Core.h" /* Implements various utility functions. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Bitmap; diff --git a/src/Vectors.h b/src/Vectors.h index e516b63d9..1936907af 100644 --- a/src/Vectors.h +++ b/src/Vectors.h @@ -4,7 +4,7 @@ #include "Constants.h" /* Represents 2 and 3 component vectors, and 4 x 4 matrix. Frustum culling sourced from http://www.crownandcutlass.com/features/technicaldetails/frustum.html - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ /* 2 component vector (2D vector) */ diff --git a/src/Vorbis.h b/src/Vorbis.h index 76eb6eaf0..1b52635c2 100644 --- a/src/Vorbis.h +++ b/src/Vorbis.h @@ -2,7 +2,7 @@ #define CC_VORBIS_H #include "Core.h" /* Decodes ogg vorbis audio - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct Stream; #define VORBIS_MAX_CHANS 8 diff --git a/src/Widgets.h b/src/Widgets.h index 9af536d2f..27788a936 100644 --- a/src/Widgets.h +++ b/src/Widgets.h @@ -5,7 +5,7 @@ #include "Constants.h" #include "Entity.h" /* Contains all 2D widget implementations. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct FontDesc; diff --git a/src/Window.h b/src/Window.h index 2d80abfb5..b59ed5e55 100644 --- a/src/Window.h +++ b/src/Window.h @@ -2,7 +2,7 @@ #define CC_WINDOW_H #include "Core.h" /* Abstracts creating and managing the native window. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 | Based on OpenTK code + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 | Based on OpenTK code */ /* diff --git a/src/World.h b/src/World.h index 7c9a45428..13d62ee5c 100644 --- a/src/World.h +++ b/src/World.h @@ -4,7 +4,7 @@ #include "PackedCol.h" /* Represents a fixed size 3D array of blocks. Also contains associated environment metadata. - Copyright 2014-2020 ClassiCube | Licensed under BSD-3 + Copyright 2014-2021 ClassiCube | Licensed under BSD-3 */ struct AABB;