git-svn-id: https://svn.eduke32.com/eduke32@962 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/source/actors.c

@@ -537,8 +537,8 @@ int movesprite(int spritenum, int xchange, int ychange, int zchange, unsigned in
 inline int ssp(int i,unsigned int cliptype) //The set sprite function
 {
     return (movesprite(i,(sprite[i].xvel*(sintable[(sprite[i].ang+512)&2047]))>>14,
-                         (sprite[i].xvel*(sintable[sprite[i].ang&2047]))>>14,sprite[i].zvel,
-                         cliptype)==0);
+                       (sprite[i].xvel*(sintable[sprite[i].ang&2047]))>>14,sprite[i].zvel,
+                       cliptype)==0);
 }
 
 #undef deletesprite

polymer/eduke32/source/config.c

@@ -1010,7 +1010,7 @@ void CONFIG_WriteSetup(void)
 #endif
 
     if (crosshair_colors.r != default_crosshair_colors.r || crosshair_colors.g != default_crosshair_colors.g
-        || crosshair_colors.b != default_crosshair_colors.b)
+            || crosshair_colors.b != default_crosshair_colors.b)
     {
         Bsprintf(tempbuf,"%d,%d,%d",crosshair_colors.r,crosshair_colors.g,crosshair_colors.b);
         SCRIPT_PutString(ud.config.scripthandle, "Misc", "CrosshairColor",tempbuf);

polymer/eduke32/source/game.c

@@ -1860,8 +1860,8 @@ static void altdigitalnumber(int x,int y,int n,char s,char cs)
     for (k=0;k<i;k++)
     {
         p = althud_numbertile+*(b+k)-'0';
-            if (shd)
-                rotatesprite(sbarx(c+j+1),sbary(y+1),sbarsc(65536L),0,p,s,4,cs|1|32,0,0,xdim-1,ydim-1);
+        if (shd)
+            rotatesprite(sbarx(c+j+1),sbary(y+1),sbarsc(65536L),0,p,s,4,cs|1|32,0,0,xdim-1,ydim-1);
         rotatesprite(sbarx(c+j),sbary(y),sbarsc(65536L),0,p,s,althud_numberpal,cs,0,0,xdim-1,ydim-1);
         j += tilesizx[p]+1;
     }
@@ -2054,7 +2054,7 @@ static void coolgaugetext(int snum)
             if (p->curr_weapon == HANDREMOTE_WEAPON) i = HANDBOMB_WEAPON;
             else i = p->curr_weapon;
             if (p->curr_weapon != KNEE_WEAPON &&
-                (!althud_flashing || totalclock&32 || p->ammo_amount[i] > (p->max_ammo_amount[i]/10)))
+                    (!althud_flashing || totalclock&32 || p->ammo_amount[i] > (p->max_ammo_amount[i]/10)))
                 altdigitalnumber(-20,-(200-22),p->ammo_amount[i],-16,10+16);
 
             o = 102;
@@ -5420,7 +5420,7 @@ int spawn(int j, int pn)
 
                     T1 = TRAND&1;
                     sp->z = (3<<8)+g_player[snum].ps->pyoff+g_player[snum].ps->posz-
-                        ((g_player[snum].ps->horizoff+g_player[snum].ps->horiz-100)<<4);
+                            ((g_player[snum].ps->horizoff+g_player[snum].ps->horiz-100)<<4);
                     if (sp->picnum == SHOTGUNSHELL)
                         sp->z += (3<<8);
                     sp->zvel = -(TRAND&255);

polymer/eduke32/source/gamedef.c

@@ -3799,8 +3799,8 @@ static int parsecommand(void)
         // syntax: addlogvar <var>
 
         // prints the line number in the log file.
-/*        *scriptptr=line_number;
-        scriptptr++; */
+        /*        *scriptptr=line_number;
+                scriptptr++; */
 
         // get the ID of the DEF
         transvar();
@@ -4217,8 +4217,8 @@ repeatcase:
         // syntax: addlog
 
         // prints the line number in the log file.
-/*        *scriptptr=line_number;
-        scriptptr++; */
+        /*        *scriptptr=line_number;
+                scriptptr++; */
         return 0;
 
     case CON_IFPINVENTORY:

polymer/eduke32/source/gameexec.c

@@ -5343,11 +5343,11 @@ static int parse(void)
                 s1=fta_quotes[q1];
                 s2=fta_quotes[q2];
                 while (*s2&&st--)s2++;
-            while ((*s1=*s2)&&ln--) {s1++;s2++;}
-        *s1=0;
+                while ((*s1=*s2)&&ln--) {s1++;s2++;}
+                *s1=0;
+            }
+            break;
         }
-        break;
-    }
 
     case CON_GETPNAME:
     case CON_QSTRCAT:
@@ -6111,6 +6111,28 @@ static int parse(void)
             break;
         }
 
+    case CON_GETTIMEDATE:
+        insptr++;
+        {
+            int v1=*insptr++,v2=*insptr++,v3=*insptr++,v4=*insptr++,v5=*insptr++,v6=*insptr++,v7=*insptr++,v8=*insptr++;
+            time_t rawtime;
+            struct tm * ti;
+
+            time(&rawtime);
+            ti=localtime(&rawtime);
+            // initprintf("Time&date: %s\n",asctime (ti));
+
+            SetGameVarID(v1, ti->tm_sec,  g_i, g_p);
+            SetGameVarID(v2, ti->tm_min,  g_i, g_p);
+            SetGameVarID(v3, ti->tm_hour, g_i, g_p);
+            SetGameVarID(v4, ti->tm_mday, g_i, g_p);
+            SetGameVarID(v5, ti->tm_mon,  g_i, g_p);
+            SetGameVarID(v6, ti->tm_year+1900, g_i, g_p);
+            SetGameVarID(v7, ti->tm_wday, g_i, g_p);
+            SetGameVarID(v8, ti->tm_yday, g_i, g_p);
+            break;
+        }
+
     case CON_MOVESPRITE:
     case CON_SETSPRITE:
         insptr++;
@@ -6745,7 +6767,7 @@ static int parse(void)
                     if ((index < aGameArrays[lVarID].size)&&(index>=0))
                     {
                         OSD_Printf(OSDTEXT_GREEN "CON_ADDLOGVAR: L=%d %s[%d] =%d\n",line_num,
-                            aGameArrays[lVarID].szLabel,index,m*aGameArrays[lVarID].plValues[index]);
+                                   aGameArrays[lVarID].szLabel,index,m*aGameArrays[lVarID].plValues[index]);
                         break;
                     }
                     else

polymer/eduke32/source/player.c

@@ -3331,7 +3331,7 @@ void processinput(int snum)
     shrunk = (s->yrepeat < 32);
     getzrange(p->posx,p->posy,p->posz,psect,&cz,&hz,&fz,&lz,163L,CLIPMASK0);
 
-    /*    
+    /*
     j = getflorzofslope(psect,p->posx,p->posy);
 
     p->truefz = j;