Fix warnings in frotz, one of which is a real bug :)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24268 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 6 insertions, 6 deletions

diff --git a/apps/plugins/frotz/dumb_init.c b/apps/plugins/frotz/dumb_init.c
index ea08447c0c..e4ab3ad824 100644
--- a/apps/plugins/frotz/dumb_init.c
+++ b/apps/plugins/frotz/dumb_init.c
@@ -53,7 +53,7 @@ int os_random_seed (void)
 {
   if (user_random_seed == -1)
     /* Use the rockbox tick as seed value */
-    return ((int)rb->current_tick) & 0x7fff;
+    return ((int)*rb->current_tick) & 0x7fff;
   else return user_random_seed;
 }
 
diff --git a/apps/plugins/frotz/fastmem.c b/apps/plugins/frotz/fastmem.c
index cdb4bce602..ba0c95f5ce 100644
--- a/apps/plugins/frotz/fastmem.c
+++ b/apps/plugins/frotz/fastmem.c
@@ -342,7 +342,7 @@ void init_memory (void)
     }
 
     /* Assign left over memory as the arena for undo alloc */
-    arena_start = arena_next = (void*)((int)(zmp + story_size + 3) & ~3);
+    arena_start = arena_next = (void*)((intptr_t)(zmp + story_size + 3) & ~3);
     arena_end = zmp + buf_size;
 
     /* Load story file in chunks of 32KB */
@@ -385,7 +385,7 @@ void init_undo (void)
     if ((arena_end - arena_start) >= size) {
 	prev_zmp = arena_start;
 	undo_diff = arena_start + h_dynamic_size;
-	arena_start = (void*)((int)(arena_start + size + 3) & ~3);
+	arena_start = (void*)((intptr_t)(arena_start + size + 3) & ~3);
 	arena_next = arena_start;
 	memcpy (prev_zmp, zmp, h_dynamic_size);
     } else
@@ -691,7 +691,7 @@ static long mem_diff (zbyte *a, zbyte *b, zword mem_size, zbyte *diff)
     unsigned size = mem_size;
     zbyte *p = diff;
     unsigned j;
-    zbyte c;
+    zbyte c = 0;
 
     for (;;) {
 	for (j = 0; size > 0 && (c = *a++ ^ *b++) == 0; j++)
@@ -928,7 +928,7 @@ int save_undo (void)
 	    if ((arena_end - arena_next) >= size) {
 		/* Trivial: enough room at the end */
 		p = arena_next;
-		arena_next = (void*)((int)(arena_next + size + 3) & ~3);
+		arena_next = (void*)((intptr_t)(arena_next + size + 3) & ~3);
 	    } else {
 		/* Need to wrap */
 		arena_next = arena_start;
@@ -939,7 +939,7 @@ int save_undo (void)
 	    if (((void*)first_undo - arena_next) >= size) {
 		/* There is room before the "first" undo */
 		p = arena_next;
-		arena_next = (void*)((int)(arena_next + size + 3) & ~3);
+		arena_next = (void*)((intptr_t)(arena_next + size + 3) & ~3);
 	    } else {
 		/* Not enough room, just need to free some */
 		p = NULL;