YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing some compiler warnings.

Browse Source
This commit is contained in:
Dominic Masters
2021-09-02 07:01:31 -07:00
parent 45a4354ebb
commit 5c4fc01b43
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/dawn/libs.h
View File

@ -42,7 +42,12 @@
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
// Windows Fixes // Windows Fixes
# define strtok_r strtok_s # define strtok_r strtok_s
# define sleep(n) _sleep(n)
#if defined(Sleep)
# define sleep(n) Sleep(n)
#else
# define sleep(n) _sleep(n)
#endif
#else #else
#include <unistd.h> #include <unistd.h>
#endif #endif

8
src/display/camera.c
View File

@ -41,9 +41,9 @@ void cameraOrbit(camera_t *camera,
float distance, float yaw, float pitch, float distance, float yaw, float pitch,
float targetX, float targetY, float targetZ float targetX, float targetY, float targetZ
) { ) {
float cy = cos(pitch); float cy = cosf(pitch);
float x = distance * sin(yaw) * cy; float x = distance * sinf(yaw) * cy;
float y = distance * sin(pitch); float y = distance * sinf(pitch);
float z = distance * cos(yaw) * cy; float z = distance * cosf(yaw) * cy;
cameraLookAt(camera, x, y, z, targetX, targetY, targetZ); cameraLookAt(camera, x, y, z, targetX, targetY, targetZ);
} }

8
src/game/poker/pokergame.c
View File

@ -74,12 +74,12 @@ void pokerGameUpdate(game_t *game) {
menuUpdate(&menu, &game->engine); menuUpdate(&menu, &game->engine);
for(i = 0; i < menu.itemCount; i++) { for(i = 0; i < menu.itemCount; i++) {
menuitem_t *item = menu.items + i; menuitem_t *item = menu.items + i;
frame.x = item->x * (FRAME_BORDER_SIZE + FRAME_BORDER_SIZE); frame.x = (float)item->x * (FRAME_BORDER_SIZE + FRAME_BORDER_SIZE);
frame.y = item->y * (FRAME_BORDER_SIZE + FRAME_BORDER_SIZE); frame.y = (float)item->y * (FRAME_BORDER_SIZE + FRAME_BORDER_SIZE);
if(menu.selected == i) frame.y -= FRAME_BORDER_SIZE; if(menu.selected == i) frame.y -= FRAME_BORDER_SIZE;
frameSetSize(&frame, frameSetSize(&frame,
item->width * (FRAME_BORDER_SIZE + FRAME_BORDER_SIZE), (float)item->width * (FRAME_BORDER_SIZE + FRAME_BORDER_SIZE),
item->height * (FRAME_BORDER_SIZE + FRAME_BORDER_SIZE) (float)item->height * (FRAME_BORDER_SIZE + FRAME_BORDER_SIZE)
); );
frameRender(&frame, &pokerGame->assets.shader); frameRender(&frame, &pokerGame->assets.shader);
} }

6
src/ui/menulist.c
View File

@ -5,8 +5,4 @@
* https://opensource.org/licenses/MIT * https://opensource.org/licenses/MIT
*/ */
#include "menulist.h" #include "menulist.h"
void menuListInit(menulist_t *list) {
}

2
src/vn/gui/vntextbox.c
View File

@ -54,7 +54,7 @@ void vnTextBoxRebuffer(vntextbox_t *box) {
void vnTextBoxUpdate(vntextbox_t *box, engine_t *engine) { void vnTextBoxUpdate(vntextbox_t *box, engine_t *engine) {
int32_t i; int32_t i;
if(box->state & VN_TEXTBOX_STATE_CLOSED > 0) return; if(box->state & VN_TEXTBOX_STATE_CLOSED) return;
// "Next text box" // "Next text box"
if(!vnTextBoxHasScrolled(box)) { if(!vnTextBoxHasScrolled(box)) {

4
src/vn/vncharacter.c
View File

@ -61,8 +61,8 @@ void _vnCharacterBuffer(vncharacter_t *character,
float tpy = 1.0f / (float)character->texture->height; float tpy = 1.0f / (float)character->texture->height;
// Center inside the character // Center inside the character
x -= (float)character->baseWidth / 2; x -= character->baseWidth / 2;
y += (float)character->baseHeight / 2; y += character->baseHeight / 2;
quadBuffer(&character->primitive, 0.001f * (float)i, quadBuffer(&character->primitive, 0.001f * (float)i,
(float)x * ps, 1 - (float)y * ps, (float)x * ps, 1 - (float)y * ps,