[Opentnl-cvs] tnl/zap UIGame.cpp,1.24,1.25 UINameEntry.cpp,1.2,1.3 gsm_state.c,1.1,1.2

[Mark F. <mar...@us...>]

Update of /cvsroot/opentnl/tnl/zap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31239/zap

Modified Files:
	UIGame.cpp UINameEntry.cpp gsm_state.c 
Log Message:
Fixed some mac bugs


Index: UINameEntry.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/UINameEntry.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UINameEntry.cpp	11 May 2004 18:26:24 -0000	1.2
--- UINameEntry.cpp	12 May 2004 22:30:54 -0000	1.3
***************
*** 75,79 ****
     if(key == '\r')
        onAccept();
!    else if(key == 8)
     {
        // backspace key
--- 75,79 ----
     if(key == '\r')
        onAccept();
!    else if(key == 8 || key == 127)
     {
        // backspace key
***************
*** 93,99 ****
        for(U32 i = MaxNameLen - 1; i > cursorPos; i--)
           buffer[i] = buffer[i-1];
-       buffer[cursorPos] = key;
        if(cursorPos < MaxNameLen-1)
           cursorPos++;
     }
  }
--- 93,101 ----
        for(U32 i = MaxNameLen - 1; i > cursorPos; i--)
           buffer[i] = buffer[i-1];
        if(cursorPos < MaxNameLen-1)
+       {
+          buffer[cursorPos] = key;
           cursorPos++;
+       }
     }
  }

Index: UIGame.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/UIGame.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** UIGame.cpp	12 May 2004 21:08:25 -0000	1.24
--- UIGame.cpp	12 May 2004 22:30:54 -0000	1.25
***************
*** 419,423 ****
        if(key == '\r')
           issueChat();
!       else if(key == 8)
        {
           // backspace key
--- 419,423 ----
        if(key == '\r')
           issueChat();
!       else if(key == 8 || key == 127)
        {
           // backspace key

Index: gsm_state.c
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/gsm_state.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gsm_state.c	9 May 2004 20:44:07 -0000	1.1
--- gsm_state.c	12 May 2004 22:30:54 -0000	1.2
***************
*** 28,32 ****
   */
  
! #ifndef MACOSX
  #include <malloc.h>
  #endif
--- 28,32 ----
   */
  
! #if !defined( MACOSX ) && !defined (__APPLE__)
  #include <malloc.h>
  #endif