diff --git a/code/io/cursor.cpp b/code/io/cursor.cpp index 6b44dc08c7..f2c75a910a 100644 --- a/code/io/cursor.cpp +++ b/code/io/cursor.cpp @@ -12,6 +12,7 @@ #include #include +#include namespace { @@ -207,6 +208,8 @@ namespace io Cursor* CursorManager::loadFromBitmap(int bitmapHandle) { + Assertion(gr_screen.mode != GR_STUB, "Cursors can not be used with the stub renderer!"); + Assertion(bm_is_valid(bitmapHandle), "%d is no valid bitmap handle!", bitmapHandle); int nframes; diff --git a/code/parse/lua.cpp b/code/parse/lua.cpp index 28e01ba470..2c6c41197b 100644 --- a/code/parse/lua.cpp +++ b/code/parse/lua.cpp @@ -12987,6 +12987,9 @@ ADE_FUNC(setCursorImage, l_Mouse, "Image filename", "Sets mouse cursor image, an if(!mouse_inited || !Gr_inited) return ade_set_error(L, "b", false); + if (Is_standalone) + return ade_set_error(L, "b", false); + char *s = NULL; enum_h *u = NULL; // This isn't used anymore diff --git a/freespace2/freespace.cpp b/freespace2/freespace.cpp index 648a4f8aa4..c89d89bd84 100644 --- a/freespace2/freespace.cpp +++ b/freespace2/freespace.cpp @@ -1974,10 +1974,12 @@ void game_init() pilot_load_pic_list(); pilot_load_squad_pic_list(); - // Load the default cursor and enable it - io::mouse::Cursor* cursor = io::mouse::CursorManager::get()->loadCursor("cursor", true); - if (cursor) { - io::mouse::CursorManager::get()->setCurrentCursor(cursor); + if (!Is_standalone) { + // Load the default cursor and enable it + io::mouse::Cursor* cursor = io::mouse::CursorManager::get()->loadCursor("cursor", true); + if (cursor) { + io::mouse::CursorManager::get()->setCurrentCursor(cursor); + } } if(!Cmdline_reparse_mainhall)