Skip to content

Commit

Permalink
should fix #1
Browse files Browse the repository at this point in the history
  • Loading branch information
RSDuck committed Aug 23, 2017
1 parent 9968a83 commit 0ec01ca
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 4 deletions.
20 changes: 20 additions & 0 deletions dependencies/vec/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Copyright (c) 2014 rxi


Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
3 changes: 3 additions & 0 deletions source/entity/Player.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ void Player_Move(Player* player, float dt, float3 accl) {
const float SimStep = 1.f / 60.f;
while (player->simStepAccum >= SimStep) {
player->velocity.y -= GravityPlusFriction * SimStep * 2.f;
if(player->velocity.y < MaxFallVelocity)
player->velocity.y = MaxFallVelocity;

float speedFactor = 1.f;
if (!player->grounded) {
if (player->jumped)
Expand Down
3 changes: 2 additions & 1 deletion source/gui/WorldSelect.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ bool WorldSelect_Update(char* out_worldpath, char* out_name, WorldGenType* world

#ifndef _DEBUG
swkbdInit(&swkbd, SWKBD_TYPE_WESTERN, 2, WORLD_NAME_SIZE);
swkbdSetValidation(&swkbd, SWKBD_NOTEMPTY_NOTBLANK, 0, WORLD_NAME_SIZE);
swkbdSetHintText(&swkbd, "Enter the world name");

int button = swkbdInputText(&swkbd, name, 12);
Expand All @@ -199,7 +200,7 @@ bool WorldSelect_Update(char* out_worldpath, char* out_name, WorldGenType* world
#endif

strcpy(out_name, name);
if (button != SWKBD_BUTTON_NONE) {
if (button == SWKBD_BUTTON_CONFIRM) {
strcpy(out_worldpath, out_name);

int length = strlen(out_worldpath);
Expand Down
2 changes: 1 addition & 1 deletion source/misc/CommandLine.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ void CommandLine_Activate(World* world, Player* player) {
swkbdSetHintText(&swkbd, "Enter command");

int button = swkbdInputText(&swkbd, textBuffer, sizeof(textBuffer));
if (button != SWKBD_BUTTON_NONE) {
if (button == SWKBD_BUTTON_CONFIRM) {
CommandLine_Execute(world, player, textBuffer);
}
}
Expand Down
5 changes: 3 additions & 2 deletions todo.todo
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Alles mögliche:
✔ "Neue Welt erstellen" implementieren @done (21.8.2017, 18:19:32)

Weltgeneration:
Nicht Superflach Welten @0.2
Nicht Superflach Welten @0.2 @done (23.8.2017, 13:12:11)
☐ Bäume(benötigt entsprechende Blöcke)

Gameplay:
Expand All @@ -45,4 +45,5 @@ Bugs:
✔ Frustum Culling funktioniert doch immer noch nicht ganz so wie es soll @critical @0.2 @done (12.8.2017, 22:43:14)
✔ Load Chunk Funktion kann zu doppelten Chunks führen @done (13.8.2017, 13:26:22)
✔ Manchmal wird ein Chunk nicht gespeichert oder geladen @done (21.8.2017, 15:19:03)
✔ Beenden wenn man noch im Menü ist @done (22.8.2017, 02:14:19)
✔ Beenden wenn man noch im Menü ist @done (22.8.2017, 02:14:19)
☐ Wenn man einen Namen eingibt der, bereinigt, identisch ist mit einer existierenden Welt, wird nichts dagegen unternommen

0 comments on commit 0ec01ca

Please sign in to comment.