aboutsummaryrefslogtreecommitdiff
path: root/redist
diff options
context:
space:
mode:
authorMike Turvey <mturvey6@gmail.com>2018-01-15 22:40:14 -0700
committerMike Turvey <mturvey6@gmail.com>2018-01-15 22:40:14 -0700
commitb2eb7569a8963917116c4520e15b17f0578a2509 (patch)
tree0d9eea391f3b266bcb80c47131092e0dbf317600 /redist
parent7817da63526f35d10d6d4f6b3d9c02280719e023 (diff)
downloadlibsurvive-b2eb7569a8963917116c4520e15b17f0578a2509.tar.gz
libsurvive-b2eb7569a8963917116c4520e15b17f0578a2509.tar.bz2
Fix a few warnings
Diffstat (limited to 'redist')
-rw-r--r--redist/CNFGWinDriver.c5
-rw-r--r--redist/json_helpers.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/redist/CNFGWinDriver.c b/redist/CNFGWinDriver.c
index b1c1eb0..9d1be6a 100644
--- a/redist/CNFGWinDriver.c
+++ b/redist/CNFGWinDriver.c
@@ -54,8 +54,8 @@ void CNFGGetDimensions( short * x, short * y )
lasty = buffery;
InternalHandleResize();
}
- *x = bufferx;
- *y = buffery;
+ *x = (short)bufferx;
+ *y = (short)buffery;
}
@@ -212,7 +212,6 @@ void CNFGSetup( const char * name_of_window, int width, int height )
void CNFGHandleInput()
{
- int ldown = 0;
MSG msg;
while( PeekMessage( &msg, lsHWND, 0, 0xFFFF, 1 ) )
diff --git a/redist/json_helpers.c b/redist/json_helpers.c
index 8da841b..109708a 100644
--- a/redist/json_helpers.c
+++ b/redist/json_helpers.c
@@ -193,7 +193,7 @@ void json_load_file(const char* path) {
} else if (value_t->type == JSMN_OBJECT) {
printf("Begin Object\n");
if (json_begin_object != NULL) json_begin_object(tag);
- children = value_t->size +1; //+1 to account for this loop where we are not yed parsing children
+ children = (int16_t)(value_t->size +1); //+1 to account for this loop where we are not yed parsing children
// i += decode_jsmn_object(JSON_STRING, tokens+i+2,value_t->size);
}
else {