zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a missing header, fix a config file bug and switch "exponentially" for "dramatically" in the texture caching dialog.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@288 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-09-02 01:40:20 +00:00
parent c1bb2adb2c
commit c0f93c2aad
4 changed files with 491 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

479
polymer/build/include/dynamicgtk.h Executable file
View file

@ -0,0 +1,479 @@
#ifndef __dynamicgtk_h__
#define __dynamicgtk_h__
#include <gdk-pixbuf/gdk-pixdata.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtk.h>
struct _dynamicgtksyms {
// gobject.h
gpointer (*g_object_get_data) (GObject *object,
const gchar *key);
void (*g_object_set_data) (GObject *object,
const gchar *key,
gpointer data);
void (*g_object_set_data_full) (GObject *object,
const gchar *key,
gpointer data,
GDestroyNotify destroy);
void (*g_object_unref) (gpointer object);
// gsignal.h
gulong (*g_signal_connect_data) (gpointer instance,
const gchar *detailed_signal,
GCallback c_handler,
gpointer data,
GClosureNotify destroy_data,
GConnectFlags connect_flags);
guint (*g_signal_handlers_block_matched) (gpointer instance,
GSignalMatchType mask,
guint signal_id,
GQuark detail,
GClosure *closure,
gpointer func,
gpointer data);
guint (*g_signal_handlers_unblock_matched) (gpointer instance,
GSignalMatchType mask,
guint signal_id,
GQuark detail,
GClosure *closure,
gpointer func,
gpointer data);
// gtype.h
GTypeInstance* (*g_type_check_instance_cast) (GTypeInstance *instance,
GType iface_type);
// gdk-pixdata.h
GdkPixbuf* (*gdk_pixbuf_from_pixdata) (const GdkPixdata *pixdata,
gboolean copy_pixels,
GError **error);
// gdk-pixbuf-core.h
GdkPixbuf *(*gdk_pixbuf_new_from_data) (const guchar *data,
GdkColorspace colorspace,
gboolean has_alpha,
int bits_per_sample,
int width, int height,
int rowstride,
GdkPixbufDestroyNotify destroy_fn,
gpointer destroy_fn_data);
// gtkaccelgroup.h
GtkAccelGroup* (*gtk_accel_group_new) (void);
// gtkalignment.h
GtkWidget* (*gtk_alignment_new) (gfloat xalign,
gfloat yalign,
gfloat xscale,
gfloat yscale);
// gtkbox.h
GType (*gtk_box_get_type) (void) G_GNUC_CONST;
void (*gtk_box_pack_start) (GtkBox *box,
GtkWidget *child,
gboolean expand,
gboolean fill,
guint padding);
// gtkbbox.h
GType (*gtk_button_box_get_type) (void) G_GNUC_CONST;
void (*gtk_button_box_set_layout) (GtkButtonBox *widget,
GtkButtonBoxStyle layout_style);
// gtkbutton.h
GtkWidget* (*gtk_button_new) (void);
// gtkcelllayout.h
GType (*gtk_cell_layout_get_type) (void) G_GNUC_CONST;
void (*gtk_cell_layout_pack_start) (GtkCellLayout *cell_layout,
GtkCellRenderer *cell,
gboolean expand);
void (*gtk_cell_layout_set_attributes) (GtkCellLayout *cell_layout,
GtkCellRenderer *cell,
...) G_GNUC_NULL_TERMINATED;
// gtkcellrenderertext.h
GtkCellRenderer *(*gtk_cell_renderer_text_new) (void);
// gtkcheckbutton.h
GtkWidget* (*gtk_check_button_new_with_mnemonic) (const gchar *label);
// gtkcombobox.h
gboolean (*gtk_combo_box_get_active_iter) (GtkComboBox *combo_box,
GtkTreeIter *iter);
GtkTreeModel *(*gtk_combo_box_get_model) (GtkComboBox *combo_box);
GType (*gtk_combo_box_get_type) (void) G_GNUC_CONST;
GtkWidget *(*gtk_combo_box_new_text) (void);
GtkWidget *(*gtk_combo_box_new_with_model) (GtkTreeModel *model);
void (*gtk_combo_box_set_active_iter) (GtkComboBox *combo_box,
GtkTreeIter *iter);
// gtkcontainer.h
void (*gtk_container_add) (GtkContainer *container,
GtkWidget *widget);
void (*gtk_container_foreach) (GtkContainer *container,
GtkCallback callback,
gpointer callback_data);
GType (*gtk_container_get_type) (void) G_GNUC_CONST;
void (*gtk_container_set_border_width) (GtkContainer *container,
guint border_width);
// gtkdialog.h
GType (*gtk_dialog_get_type) (void) G_GNUC_CONST;
gint (*gtk_dialog_run) (GtkDialog *dialog);
// gtkfixed.h
GType (*gtk_fixed_get_type) (void) G_GNUC_CONST;
GtkWidget* (*gtk_fixed_new) (void);
void (*gtk_fixed_put) (GtkFixed *fixed,
GtkWidget *widget,
gint x,
gint y);
// gtkhbox.h
GtkWidget* (*gtk_hbox_new) (gboolean homogeneous,
gint spacing);
// gtkhbbox.h
GtkWidget* (*gtk_hbutton_box_new) (void);
// gtkimage.h
GtkWidget* (*gtk_image_new_from_pixbuf) (GdkPixbuf *pixbuf);
GtkWidget* (*gtk_image_new_from_stock) (const gchar *stock_id,
GtkIconSize size);
// gtkmain.h
gboolean (*gtk_init_check) (int *argc,
char ***argv);
// gtklabel.h
GType (*gtk_label_get_type) (void) G_GNUC_CONST;
GtkWidget* (*gtk_label_new) (const gchar *str);
GtkWidget* (*gtk_label_new_with_mnemonic) (const gchar *str);
void (*gtk_label_set_mnemonic_widget) (GtkLabel *label,
GtkWidget *widget);
// gtkliststore.h
void (*gtk_list_store_append) (GtkListStore *list_store,
GtkTreeIter *iter);
void (*gtk_list_store_clear) (GtkListStore *list_store);
GType (*gtk_list_store_get_type) (void) G_GNUC_CONST;
GtkListStore *(*gtk_list_store_new) (gint n_columns,
...);
void (*gtk_list_store_set) (GtkListStore *list_store,
GtkTreeIter *iter,
...);
// gtkmain.h
void (*gtk_main) (void);
gboolean (*gtk_main_iteration_do) (gboolean blocking);
void (*gtk_main_quit) (void);
// gtkmessagedialog.h
GtkWidget* (*gtk_message_dialog_new) (GtkWindow *parent,
GtkDialogFlags flags,
GtkMessageType type,
GtkButtonsType buttons,
const gchar *message_format,
...) G_GNUC_PRINTF (5, 6);
// gtkmisc.h
GType (*gtk_misc_get_type) (void) G_GNUC_CONST;
void (*gtk_misc_set_alignment) (GtkMisc *misc,
gfloat xalign,
gfloat yalign);
// gtknotebook.h
GtkWidget* (*gtk_notebook_get_nth_page) (GtkNotebook *notebook,
gint page_num);
GType (*gtk_notebook_get_type) (void) G_GNUC_CONST;
GtkWidget * (*gtk_notebook_new) (void);
void (*gtk_notebook_set_current_page) (GtkNotebook *notebook,
gint page_num);
void (*gtk_notebook_set_tab_label) (GtkNotebook *notebook,
GtkWidget *child,
GtkWidget *tab_label);
// gtkobject.h
GtkType (*gtk_object_get_type) (void) G_GNUC_CONST;
// gtkscrolledwindow.h
GType (*gtk_scrolled_window_get_type) (void) G_GNUC_CONST;
GtkWidget* (*gtk_scrolled_window_new) (GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment);
void (*gtk_scrolled_window_set_policy) (GtkScrolledWindow *scrolled_window,
GtkPolicyType hscrollbar_policy,
GtkPolicyType vscrollbar_policy);
// gtktextbuffer.h
gboolean (*gtk_text_buffer_backspace) (GtkTextBuffer *buffer,
GtkTextIter *iter,
gboolean interactive,
gboolean default_editable);
GtkTextMark *(*gtk_text_buffer_create_mark) (GtkTextBuffer *buffer,
const gchar *mark_name,
const GtkTextIter *where,
gboolean left_gravity);
void (*gtk_text_buffer_delete_mark) (GtkTextBuffer *buffer,
GtkTextMark *mark);
void (*gtk_text_buffer_get_end_iter) (GtkTextBuffer *buffer,
GtkTextIter *iter);
void (*gtk_text_buffer_insert) (GtkTextBuffer *buffer,
GtkTextIter *iter,
const gchar *text,
gint len);
// gtktextview.h
GtkTextBuffer *(*gtk_text_view_get_buffer) (GtkTextView *text_view);
GType (*gtk_text_view_get_type) (void) G_GNUC_CONST;
GtkWidget * (*gtk_text_view_new) (void);
void (*gtk_text_view_scroll_to_mark) (GtkTextView *text_view,
GtkTextMark *mark,
gdouble within_margin,
gboolean use_align,
gdouble xalign,
gdouble yalign);
void (*gtk_text_view_set_cursor_visible) (GtkTextView *text_view,
gboolean setting);
void (*gtk_text_view_set_editable) (GtkTextView *text_view,
gboolean setting);
void (*gtk_text_view_set_left_margin) (GtkTextView *text_view,
gint left_margin);
void (*gtk_text_view_set_right_margin) (GtkTextView *text_view,
gint right_margin);
void (*gtk_text_view_set_wrap_mode) (GtkTextView *text_view,
GtkWrapMode wrap_mode);
// gtktogglebutton.h
gboolean (*gtk_toggle_button_get_active) (GtkToggleButton *toggle_button);
GType (*gtk_toggle_button_get_type) (void) G_GNUC_CONST;
void (*gtk_toggle_button_set_active) (GtkToggleButton *toggle_button,
gboolean is_active);
// gtktreemodel.h
void (*gtk_tree_model_get) (GtkTreeModel *tree_model,
GtkTreeIter *iter,
...);
GType (*gtk_tree_model_get_type) (void) G_GNUC_CONST;
// gtkvbox.h
GtkWidget* (*gtk_vbox_new) (gboolean homogeneous,
gint spacing);
// gtkwidget.h
void (*gtk_widget_add_accelerator) (GtkWidget *widget,
const gchar *accel_signal,
GtkAccelGroup *accel_group,
guint accel_key,
GdkModifierType accel_mods,
GtkAccelFlags accel_flags);
void (*gtk_widget_destroy) (GtkWidget *widget);
GtkWidget* (*gtk_widget_ref) (GtkWidget *widget);
void (*gtk_widget_set_sensitive) (GtkWidget *widget,
gboolean sensitive);
void (*gtk_widget_set_size_request) (GtkWidget *widget,
gint width,
gint height);
void (*gtk_widget_show) (GtkWidget *widget);
void (*gtk_widget_unref) (GtkWidget *widget);
// gtkwindow.h
void (*gtk_window_add_accel_group) (GtkWindow *window,
GtkAccelGroup *accel_group);
GType (*gtk_window_get_type) (void) G_GNUC_CONST;
GtkWidget* (*gtk_window_new) (GtkWindowType type);
void (*gtk_window_set_default_icon) (GdkPixbuf *icon);
void (*gtk_window_set_position) (GtkWindow *window,
GtkWindowPosition position);
void (*gtk_window_set_resizable) (GtkWindow *window,
gboolean resizable);
void (*gtk_window_set_title) (GtkWindow *window,
const gchar *title);
void (*gtk_window_set_type_hint) (GtkWindow *window,
GdkWindowTypeHint hint);
};
extern struct _dynamicgtksyms dynamicgtksyms;
int dynamicgtk_init(void);
void dynamicgtk_uninit(void);
#ifndef __dynamicgtkfoo__
// gobject.h
#define g_object_get_data dynamicgtksyms.g_object_get_data
#define g_object_set_data dynamicgtksyms.g_object_set_data
#define g_object_set_data_full dynamicgtksyms.g_object_set_data_full
#define g_object_unref dynamicgtksyms.g_object_unref
// gsignal.h
#define g_signal_connect_data dynamicgtksyms.g_signal_connect_data
#define g_signal_handlers_block_matched dynamicgtksyms.g_signal_handlers_block_matched
#define g_signal_handlers_unblock_matched dynamicgtksyms.g_signal_handlers_unblock_matched
// gtype.h
#define g_type_check_instance_cast dynamicgtksyms.g_type_check_instance_cast
// gdk-pixdata.h
#define gdk_pixbuf_from_pixdata dynamicgtksyms.gdk_pixbuf_from_pixdata
// gdk-pixbuf-core.h
#define gdk_pixbuf_new_from_data dynamicgtksyms.gdk_pixbuf_new_from_data
// gtkaccelgroup.h
#define gtk_accel_group_new dynamicgtksyms.gtk_accel_group_new
// gtkalignment.h
#define gtk_alignment_new dynamicgtksyms.gtk_alignment_new
// gtkbox.h
#define gtk_box_get_type dynamicgtksyms.gtk_box_get_type
#define gtk_box_pack_start dynamicgtksyms.gtk_box_pack_start
// gtkbbox.h
#define gtk_button_box_get_type dynamicgtksyms.gtk_button_box_get_type
#define gtk_button_box_set_layout dynamicgtksyms.gtk_button_box_set_layout
// gtkbutton.h
#define gtk_button_new dynamicgtksyms.gtk_button_new
// gtkcelllayout.h
#define gtk_cell_layout_get_type dynamicgtksyms.gtk_cell_layout_get_type
#define gtk_cell_layout_pack_start dynamicgtksyms.gtk_cell_layout_pack_start
#define gtk_cell_layout_set_attributes dynamicgtksyms.gtk_cell_layout_set_attributes
// gtkcellrenderertext.h
#define gtk_cell_renderer_text_new dynamicgtksyms.gtk_cell_renderer_text_new
// gtkcheckbutton.h
#define gtk_check_button_new_with_mnemonic dynamicgtksyms.gtk_check_button_new_with_mnemonic
// gtkcombobox.h
#define gtk_combo_box_get_active_iter dynamicgtksyms.gtk_combo_box_get_active_iter
#define gtk_combo_box_get_model dynamicgtksyms.gtk_combo_box_get_model
#define gtk_combo_box_get_type dynamicgtksyms.gtk_combo_box_get_type
#define gtk_combo_box_new_text dynamicgtksyms.gtk_combo_box_new_text
#define gtk_combo_box_new_with_model dynamicgtksyms.gtk_combo_box_new_with_model
#define gtk_combo_box_set_active_iter dynamicgtksyms.gtk_combo_box_set_active_iter
// gtkcontainer.h
#define gtk_container_add dynamicgtksyms.gtk_container_add
#define gtk_container_foreach dynamicgtksyms.gtk_container_foreach
#define gtk_container_get_type dynamicgtksyms.gtk_container_get_type
#define gtk_container_set_border_width dynamicgtksyms.gtk_container_set_border_width
// gtkdialog.h
#define gtk_dialog_get_type dynamicgtksyms.gtk_dialog_get_type
#define gtk_dialog_run dynamicgtksyms.gtk_dialog_run
// gtkfixed.h
#define gtk_fixed_get_type dynamicgtksyms.gtk_fixed_get_type
#define gtk_fixed_new dynamicgtksyms.gtk_fixed_new
#define gtk_fixed_put dynamicgtksyms.gtk_fixed_put
// gtkhbox.h
#define gtk_hbox_new dynamicgtksyms.gtk_hbox_new
// gtkhbbox.h
#define gtk_hbutton_box_new dynamicgtksyms.gtk_hbutton_box_new
// gtkimage.h
#define gtk_image_new_from_pixbuf dynamicgtksyms.gtk_image_new_from_pixbuf
#define gtk_image_new_from_stock dynamicgtksyms.gtk_image_new_from_stock
// gtkmain.h
#define gtk_init_check dynamicgtksyms.gtk_init_check
// gtklabel.h
#define gtk_label_get_type dynamicgtksyms.gtk_label_get_type
#define gtk_label_new dynamicgtksyms.gtk_label_new
#define gtk_label_new_with_mnemonic dynamicgtksyms.gtk_label_new_with_mnemonic
#define gtk_label_set_mnemonic_widget dynamicgtksyms.gtk_label_set_mnemonic_widget
// gtkliststore.h
#define gtk_list_store_append dynamicgtksyms.gtk_list_store_append
#define gtk_list_store_clear dynamicgtksyms.gtk_list_store_clear
#define gtk_list_store_get_type dynamicgtksyms.gtk_list_store_get_type
#define gtk_list_store_new dynamicgtksyms.gtk_list_store_new
#define gtk_list_store_set dynamicgtksyms.gtk_list_store_set
// gtkmain.h
#define gtk_main dynamicgtksyms.gtk_main
#define gtk_main_iteration_do dynamicgtksyms.gtk_main_iteration_do
#define gtk_main_quit dynamicgtksyms.gtk_main_quit
// gtkmessagedialog.h
#define gtk_message_dialog_new dynamicgtksyms.gtk_message_dialog_new
// gtkmisc.h
#define gtk_misc_get_type dynamicgtksyms.gtk_misc_get_type
#define gtk_misc_set_alignment dynamicgtksyms.gtk_misc_set_alignment
// gtknotebook.h
#define gtk_notebook_get_nth_page dynamicgtksyms.gtk_notebook_get_nth_page
#define gtk_notebook_get_type dynamicgtksyms.gtk_notebook_get_type
#define gtk_notebook_new dynamicgtksyms.gtk_notebook_new
#define gtk_notebook_set_current_page dynamicgtksyms.gtk_notebook_set_current_page
#define gtk_notebook_set_tab_label dynamicgtksyms.gtk_notebook_set_tab_label
// gtkobject.h
#define gtk_object_get_type dynamicgtksyms.gtk_object_get_type
// gtkscrolledwindow.h
#define gtk_scrolled_window_get_type dynamicgtksyms.gtk_scrolled_window_get_type
#define gtk_scrolled_window_new dynamicgtksyms.gtk_scrolled_window_new
#define gtk_scrolled_window_set_policy dynamicgtksyms.gtk_scrolled_window_set_policy
// gtktextbuffer.h
#define gtk_text_buffer_backspace dynamicgtksyms.gtk_text_buffer_backspace
#define gtk_text_buffer_create_mark dynamicgtksyms.gtk_text_buffer_create_mark
#define gtk_text_buffer_delete_mark dynamicgtksyms.gtk_text_buffer_delete_mark
#define gtk_text_buffer_get_end_iter dynamicgtksyms.gtk_text_buffer_get_end_iter
#define gtk_text_buffer_insert dynamicgtksyms.gtk_text_buffer_insert
// gtktextview.h
#define gtk_text_view_get_buffer dynamicgtksyms.gtk_text_view_get_buffer
#define gtk_text_view_get_type dynamicgtksyms.gtk_text_view_get_type
#define gtk_text_view_new dynamicgtksyms.gtk_text_view_new
#define gtk_text_view_scroll_to_mark dynamicgtksyms.gtk_text_view_scroll_to_mark
#define gtk_text_view_set_cursor_visible dynamicgtksyms.gtk_text_view_set_cursor_visible
#define gtk_text_view_set_editable dynamicgtksyms.gtk_text_view_set_editable
#define gtk_text_view_set_left_margin dynamicgtksyms.gtk_text_view_set_left_margin
#define gtk_text_view_set_right_margin dynamicgtksyms.gtk_text_view_set_right_margin
#define gtk_text_view_set_wrap_mode dynamicgtksyms.gtk_text_view_set_wrap_mode
// gtktogglebutton.h
#define gtk_toggle_button_get_active dynamicgtksyms.gtk_toggle_button_get_active
#define gtk_toggle_button_get_type dynamicgtksyms.gtk_toggle_button_get_type
#define gtk_toggle_button_set_active dynamicgtksyms.gtk_toggle_button_set_active
// gtktreemodel.h
#define gtk_tree_model_get dynamicgtksyms.gtk_tree_model_get
#define gtk_tree_model_get_type dynamicgtksyms.gtk_tree_model_get_type
// gtkvbox.h
#define gtk_vbox_new dynamicgtksyms.gtk_vbox_new
// gtkwidget.h
#define gtk_widget_add_accelerator dynamicgtksyms.gtk_widget_add_accelerator
#define gtk_widget_destroy dynamicgtksyms.gtk_widget_destroy
#define gtk_widget_ref dynamicgtksyms.gtk_widget_ref
#define gtk_widget_set_sensitive dynamicgtksyms.gtk_widget_set_sensitive
#define gtk_widget_set_size_request dynamicgtksyms.gtk_widget_set_size_request
#define gtk_widget_show dynamicgtksyms.gtk_widget_show
#define gtk_widget_unref dynamicgtksyms.gtk_widget_unref
// gtkwindow.h
#define gtk_window_add_accel_group dynamicgtksyms.gtk_window_add_accel_group
#define gtk_window_get_type dynamicgtksyms.gtk_window_get_type
#define gtk_window_new dynamicgtksyms.gtk_window_new
#define gtk_window_set_default_icon dynamicgtksyms.gtk_window_set_default_icon
#define gtk_window_set_position dynamicgtksyms.gtk_window_set_position
#define gtk_window_set_resizable dynamicgtksyms.gtk_window_set_resizable
#define gtk_window_set_title dynamicgtksyms.gtk_window_set_title
#define gtk_window_set_type_hint dynamicgtksyms.gtk_window_set_type_hint
#endif
#endif

2
polymer/eduke32/source/astub.c
View file

@ -4152,7 +4152,7 @@ int ExtInit(void)
"Would you like to enable the on-disk texture cache? " "Would you like to enable the on-disk texture cache? "
"This feature may use up to 200 megabytes of disk " "This feature may use up to 200 megabytes of disk "
"space if you have a great deal of high resolution " "space if you have a great deal of high resolution "
"textures and skins, but textures will load exponentially " "textures and skins, but textures will load dramatically "
"faster after the first time they are loaded."); "faster after the first time they are loaded.");
if (i) i = 'y'; if (i) i = 'y';
if(i == 'y' || i == 'Y' ) if(i == 'y' || i == 'Y' )

20
polymer/eduke32/source/config.c
View file

@ -417,12 +417,12 @@ void CONFIG_SetupMouse( void )
{ {
Bsprintf(str,"MouseButton%ld",i); temp[0] = 0; Bsprintf(str,"MouseButton%ld",i); temp[0] = 0;
if (!SCRIPT_GetString( scripthandle,"Controls", str,temp)) if (!SCRIPT_GetString( scripthandle,"Controls", str,temp))
if(CONFIG_FunctionNameToNum(temp) != -1) if(CONFIG_FunctionNameToNum(temp) != -1 || temp[0] == 0)
MouseFunctions[i][0] = CONFIG_FunctionNameToNum(temp); MouseFunctions[i][0] = CONFIG_FunctionNameToNum(temp);
Bsprintf(str,"MouseButtonClicked%ld",i); temp[0] = 0; Bsprintf(str,"MouseButtonClicked%ld",i); temp[0] = 0;
if (!SCRIPT_GetString( scripthandle,"Controls", str,temp)) if (!SCRIPT_GetString( scripthandle,"Controls", str,temp))
if(CONFIG_FunctionNameToNum(temp) != -1) if(CONFIG_FunctionNameToNum(temp) != -1 || temp[0] == 0)
MouseFunctions[i][1] = CONFIG_FunctionNameToNum(temp); MouseFunctions[i][1] = CONFIG_FunctionNameToNum(temp);
} }
@ -431,17 +431,17 @@ void CONFIG_SetupMouse( void )
{ {
Bsprintf(str,"MouseAnalogAxes%ld",i); temp[0] = 0; Bsprintf(str,"MouseAnalogAxes%ld",i); temp[0] = 0;
if (!SCRIPT_GetString(scripthandle, "Controls", str,temp)) if (!SCRIPT_GetString(scripthandle, "Controls", str,temp))
if(CONFIG_AnalogNameToNum(temp) != -1) if(CONFIG_AnalogNameToNum(temp) != -1 || temp[0] == 0)
MouseAnalogueAxes[i] = CONFIG_AnalogNameToNum(temp); MouseAnalogueAxes[i] = CONFIG_AnalogNameToNum(temp);
Bsprintf(str,"MouseDigitalAxes%ld_0",i); temp[0] = 0; Bsprintf(str,"MouseDigitalAxes%ld_0",i); temp[0] = 0;
if (!SCRIPT_GetString(scripthandle, "Controls", str,temp)) if (!SCRIPT_GetString(scripthandle, "Controls", str,temp))
if(CONFIG_FunctionNameToNum(temp) != -1) if(CONFIG_FunctionNameToNum(temp) != -1 || temp[0] == 0)
MouseDigitalFunctions[i][0] = CONFIG_FunctionNameToNum(temp); MouseDigitalFunctions[i][0] = CONFIG_FunctionNameToNum(temp);
Bsprintf(str,"MouseDigitalAxes%ld_1",i); temp[0] = 0; Bsprintf(str,"MouseDigitalAxes%ld_1",i); temp[0] = 0;
if (!SCRIPT_GetString(scripthandle, "Controls", str,temp)) if (!SCRIPT_GetString(scripthandle, "Controls", str,temp))
if(CONFIG_FunctionNameToNum(temp) != -1) if(CONFIG_FunctionNameToNum(temp) != -1 || temp[0] == 0)
MouseDigitalFunctions[i][1] = CONFIG_FunctionNameToNum(temp); MouseDigitalFunctions[i][1] = CONFIG_FunctionNameToNum(temp);
Bsprintf(str,"MouseAnalogScale%ld",i); Bsprintf(str,"MouseAnalogScale%ld",i);
@ -489,12 +489,12 @@ void CONFIG_SetupJoystick( void )
{ {
Bsprintf(str,"JoystickButton%ld",i); temp[0] = 0; Bsprintf(str,"JoystickButton%ld",i); temp[0] = 0;
if (!SCRIPT_GetString( scripthandle,"Controls", str,temp)) if (!SCRIPT_GetString( scripthandle,"Controls", str,temp))
if(CONFIG_FunctionNameToNum(temp) != -1) if(CONFIG_FunctionNameToNum(temp) != -1 || temp[0] == 0)
JoystickFunctions[i][0] = CONFIG_FunctionNameToNum(temp); JoystickFunctions[i][0] = CONFIG_FunctionNameToNum(temp);
Bsprintf(str,"JoystickButtonClicked%ld",i); temp[0] = 0; Bsprintf(str,"JoystickButtonClicked%ld",i); temp[0] = 0;
if (!SCRIPT_GetString( scripthandle,"Controls", str,temp)) if (!SCRIPT_GetString( scripthandle,"Controls", str,temp))
if(CONFIG_FunctionNameToNum(temp) != -1) if(CONFIG_FunctionNameToNum(temp) != -1 || temp[0] == 0)
JoystickFunctions[i][1] = CONFIG_FunctionNameToNum(temp); JoystickFunctions[i][1] = CONFIG_FunctionNameToNum(temp);
} }
@ -503,17 +503,17 @@ void CONFIG_SetupJoystick( void )
{ {
Bsprintf(str,"JoystickAnalogAxes%ld",i); temp[0] = 0; Bsprintf(str,"JoystickAnalogAxes%ld",i); temp[0] = 0;
if (!SCRIPT_GetString(scripthandle, "Controls", str,temp)) if (!SCRIPT_GetString(scripthandle, "Controls", str,temp))
if(CONFIG_AnalogNameToNum(temp) != -1) if(CONFIG_AnalogNameToNum(temp) != -1 || temp[0] == 0)
JoystickAnalogueAxes[i] = CONFIG_AnalogNameToNum(temp); JoystickAnalogueAxes[i] = CONFIG_AnalogNameToNum(temp);
Bsprintf(str,"JoystickDigitalAxes%ld_0",i); temp[0] = 0; Bsprintf(str,"JoystickDigitalAxes%ld_0",i); temp[0] = 0;
if (!SCRIPT_GetString(scripthandle, "Controls", str,temp)) if (!SCRIPT_GetString(scripthandle, "Controls", str,temp))
if(CONFIG_FunctionNameToNum(temp) != -1) if(CONFIG_FunctionNameToNum(temp) != -1 || temp[0] == 0)
JoystickDigitalFunctions[i][0] = CONFIG_FunctionNameToNum(temp); JoystickDigitalFunctions[i][0] = CONFIG_FunctionNameToNum(temp);
Bsprintf(str,"JoystickDigitalAxes%ld_1",i); temp[0] = 0; Bsprintf(str,"JoystickDigitalAxes%ld_1",i); temp[0] = 0;
if (!SCRIPT_GetString(scripthandle, "Controls", str,temp)) if (!SCRIPT_GetString(scripthandle, "Controls", str,temp))
if(CONFIG_FunctionNameToNum(temp) != -1) if(CONFIG_FunctionNameToNum(temp) != -1 || temp[0] == 0)
JoystickDigitalFunctions[i][1] = CONFIG_FunctionNameToNum(temp); JoystickDigitalFunctions[i][1] = CONFIG_FunctionNameToNum(temp);
Bsprintf(str,"JoystickAnalogScale%ld",i); Bsprintf(str,"JoystickAnalogScale%ld",i);

2
polymer/eduke32/source/game.c
View file

@ -8984,7 +8984,7 @@ void app_main(int argc,char **argv)
"Would you like to enable the on-disk texture cache? " "Would you like to enable the on-disk texture cache? "
"This feature may use up to 200 megabytes of disk " "This feature may use up to 200 megabytes of disk "
"space if you have a great deal of high resolution " "space if you have a great deal of high resolution "
"textures and skins, but textures will load exponentially " "textures and skins, but textures will load dramatically "
"faster after the first time they are loaded."); "faster after the first time they are loaded.");
if (i) i = 'y'; if (i) i = 'y';
if(i == 'y' || i == 'Y' ) if(i == 'y' || i == 'Y' )