Subversion Repositories eduke32

Compare Revisions

Ignore whitespace Rev 240 → Rev 241

/polymer/eduke32/source/startwin.game.c
9,7 → 9,7
#include "winlayer.h"
#include "compat.h"
 
#include "startdlg.h"
#include "grpscan.h"
 
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
32,7 → 32,7
int forcesetup;
int usemouse, usejoy;
char selectedgrp[BMAX_PATH+1];
int game;
int game;
} settings;
 
static HWND startupdlg = NULL;
117,12 → 117,9
hwnd = GetDlgItem(pages[TAB_GAME], IDGDATA);
 
for (fg = foundgrps; fg; fg=fg->next) {
for (i = 0; i<numgrpfiles; i++)
if (fg->crcval == grpfiles[i].crcval) break;
for (i = 0; i<numgrpfiles; i++) if (fg->crcval == grpfiles[i].crcval) break;
if (i == numgrpfiles) continue; // unrecognised grp file
 
Bsprintf(buf, "%s\t%s", grpfiles[i].name, fg->name);
fg->game = grpfiles[i].game;
j = ListBox_AddString(hwnd, buf);
ListBox_SetItemData(hwnd, j, (LPARAM)fg);
if (!Bstrcasecmp(fg->name, settings.selectedgrp)) ListBox_SetCurSel(hwnd, j);
175,13 → 172,13
switch (LOWORD(wParam)) {
case IDGDATA: {
int i;
if (HIWORD(wParam) != LBN_SELCHANGE) break;
if (HIWORD(wParam) != LBN_SELCHANGE) break;
i = ListBox_GetCurSel((HWND)lParam);
if (i != CB_ERR) i = ListBox_GetItemData((HWND)lParam, i);
if (i != CB_ERR) {
strcpy(settings.selectedgrp, ((struct grpfile*)i)->name);
settings.game = ((struct grpfile*)i)->game;
}
if (i != CB_ERR) {
strcpy(settings.selectedgrp, ((struct grpfile*)i)->name);
settings.game = ((struct grpfile*)i)->game;
}
return TRUE;
}
default: break;
503,7 → 500,6
 
done = -1;
 
ScanGroups();
#ifdef JFAUD
EnumAudioDevs(&wavedevs, NULL, NULL);
#endif
517,7 → 513,7
settings.forcesetup = ForceSetup;
settings.usemouse = UseMouse;
settings.usejoy = UseJoystick;
settings.game = namversion;
settings.game = gametype;
strncpy(settings.selectedgrp, duke3dgrp, BMAX_PATH);
PopulateForm(-1);
 
544,7 → 540,7
UseMouse = settings.usemouse;
UseJoystick = settings.usejoy;
duke3dgrp = settings.selectedgrp;
namversion = settings.game;
gametype = settings.game;
}
 
if (wavedevs) {