teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-16 01:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
terminx 2008-01-27 23:28:45 +00:00
parent bef6dfe7b6
commit 3f42f04ee7
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/build/src/defs.c
View file

@ -417,7 +417,9 @@ static int defsparser(scriptfile *script)
if (scriptfile_getsymbol(script,&pal)) break;
if (scriptfile_getnumber(script,&pal1)) break;
if (scriptfile_getnumber(script,&pal2)) break;
#if defined(POLYMOST) && defined(USE_OPENGL)
setpalconv(pal,pal1,pal2);
#endif
}
break;
case T_ALPHAHACK:
@ -1430,12 +1432,14 @@ case T_REDPAL: case T_BLUEPAL: case T_BROWNPAL: case T_GREYPAL: case T_GREENPAL:
}
}
#if defined(POLYMOST) && defined(USE_OPENGL)
if (palmapbits&&fnB) {
int i;
for (i=0;i<=25;i++)
if (!(palbits&(1<<i))&&(palmapbits&checkpalmaps(i)))
hicsetsubsttex(tile,i,fnB,alphacutB,xscaleB,yscaleB,flagsB);
}
#endif
if ((unsigned)tile >= (unsigned)MAXTILES)
{

22
polymer/eduke32/source/startgtk.game.c
View file

@ -197,9 +197,9 @@ static void on_startbutton_clicked(GtkButton *button, gpointer user_data)
gtk_main_quit();
}
static void on_sounddrvcombo_changed(GtkComboBox *combobox, gpointer user_data)
/* static void on_sounddrvcombo_changed(GtkComboBox *combobox, gpointer user_data)
{
}
} */
static void on_inputmousecheck_toggled(GtkToggleButton *togglebutton, gpointer user_data)
{
@ -261,8 +261,8 @@ static GtkWidget *create_window(void)
GtkWidget *fullscreencheck;
GtkWidget *vmode3dlabel;
GtkWidget *inputdevlabel;
GtkWidget *sounddrvlabel;
GtkWidget *sounddrvcombo;
/* GtkWidget *sounddrvlabel;
GtkWidget *sounddrvcombo; */
GtkWidget *inputmousecheck;
GtkWidget *inputjoycheck;
GtkWidget *vmode3dcombo;
@ -356,7 +356,7 @@ static GtkWidget *create_window(void)
gtk_fixed_put(GTK_FIXED(configlayout), inputdevlabel, 0, 120);
gtk_widget_set_size_request(inputdevlabel, 88, 20);
gtk_misc_set_alignment(GTK_MISC(inputdevlabel), 0, 0.5);
/*
sounddrvlabel = gtk_label_new_with_mnemonic("S_ound driver:");
gtk_widget_show(sounddrvlabel);
gtk_fixed_put(GTK_FIXED(configlayout), sounddrvlabel, 0, 40);
@ -370,7 +370,7 @@ static GtkWidget *create_window(void)
gtk_widget_add_accelerator(sounddrvcombo, "grab_focus", accel_group,
GDK_O, GDK_MOD1_MASK,
GTK_ACCEL_VISIBLE);
*/
inputmousecheck = gtk_check_button_new_with_mnemonic("Mo_use");
gtk_widget_show(inputmousecheck);
gtk_fixed_put(GTK_FIXED(configlayout), inputmousecheck, 88, 120);
@ -562,9 +562,9 @@ static GtkWidget *create_window(void)
g_signal_connect((gpointer) fullscreencheck, "toggled",
G_CALLBACK(on_fullscreencheck_toggled),
NULL);
g_signal_connect((gpointer) sounddrvcombo, "changed",
/* g_signal_connect((gpointer) sounddrvcombo, "changed",
G_CALLBACK(on_sounddrvcombo_changed),
NULL);
NULL);*/
g_signal_connect((gpointer) inputmousecheck, "toggled",
G_CALLBACK(on_inputmousecheck_toggled),
NULL);
@ -593,7 +593,7 @@ static GtkWidget *create_window(void)
// Associate labels with their controls
gtk_label_set_mnemonic_widget(GTK_LABEL(vmode3dlabel), vmode3dcombo);
gtk_label_set_mnemonic_widget(GTK_LABEL(sounddrvlabel), sounddrvcombo);
// gtk_label_set_mnemonic_widget(GTK_LABEL(sounddrvlabel), sounddrvcombo);
gtk_label_set_mnemonic_widget(GTK_LABEL(gamelabel), gamelist);
/* Store pointers to all widgets, for use by lookup_widget(). */
@ -607,8 +607,8 @@ static GtkWidget *create_window(void)
GLADE_HOOKUP_OBJECT(startwin, fullscreencheck, "fullscreencheck");
GLADE_HOOKUP_OBJECT(startwin, vmode3dlabel, "vmode3dlabel");
GLADE_HOOKUP_OBJECT(startwin, inputdevlabel, "inputdevlabel");
GLADE_HOOKUP_OBJECT(startwin, sounddrvlabel, "sounddrvlabel");
GLADE_HOOKUP_OBJECT(startwin, sounddrvcombo, "sounddrvcombo");
/* GLADE_HOOKUP_OBJECT(startwin, sounddrvlabel, "sounddrvlabel");
GLADE_HOOKUP_OBJECT(startwin, sounddrvcombo, "sounddrvcombo"); */
GLADE_HOOKUP_OBJECT(startwin, inputmousecheck, "inputmousecheck");
GLADE_HOOKUP_OBJECT(startwin, inputjoycheck, "inputjoycheck");
GLADE_HOOKUP_OBJECT(startwin, vmode3dcombo, "vmode3dcombo");