valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Some warnings.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3227
This commit is contained in:
Peter Veenstra 2008-10-05 14:44:52 +00:00
parent e3c5fe0708
commit 2314183f15
16 changed files with 93 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/hardware/joystick.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: joystick.cpp,v 1.19 2007-08-12 10:23:36 c2woody Exp $ */
/* $Id: joystick.cpp,v 1.20 2008-10-05 14:44:52 qbix79 Exp $ */
#include <string.h>
#include "dosbox.h"
@ -164,29 +164,25 @@ void JOYSTICK_Move_Y(Bitu which,float y) {
}
}
bool JOYSTICK_IsEnabled(Bitu which)
{
bool JOYSTICK_IsEnabled(Bitu which) {
if (which<2) return stick[which].enabled;
return false;
};
}
bool JOYSTICK_GetButton(Bitu which, Bitu num)
{
bool JOYSTICK_GetButton(Bitu which, Bitu num) {
if ((which<2) && (num<2)) return stick[which].button[num];
return false;
}
float JOYSTICK_GetMove_X(Bitu which)
{
float JOYSTICK_GetMove_X(Bitu which) {
if (which<2) return stick[which].xpos;
return 0.0f;
}
float JOYSTICK_GetMove_Y(Bitu which)
{
float JOYSTICK_GetMove_Y(Bitu which) {
if (which<2) return stick[which].ypos;
return 0.0f;
};
}
class JOYSTICK:public Module_base{
private:

4
src/hardware/mixer.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: mixer.cpp,v 1.47 2007-08-12 19:16:01 c2woody Exp $ */
/* $Id: mixer.cpp,v 1.48 2008-10-05 14:44:52 qbix79 Exp $ */
/*
Remove the sdl code from here and have it handeld in the sdlmain.
@ -265,7 +265,7 @@ void MixerChannel::AddStretched(Bitu len,Bit16s * data) {
mixer.work[mixpos][1]+=sample*volmul[1];
mixpos++;
}
};
}
void MixerChannel::AddSamples_m8(Bitu len,Bit8u * data) {
AddSamples<true,false,false>(len,data);

4
src/hardware/vga_attr.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: vga_attr.cpp,v 1.28 2008-01-09 20:34:51 c2woody Exp $ */
/* $Id: vga_attr.cpp,v 1.29 2008-10-05 14:44:52 qbix79 Exp $ */
#include "dosbox.h"
#include "inout.h"
@ -212,7 +212,7 @@ Bitu read_p3c1(Bitu port,Bitu iolen) {
LOG(LOG_VGAMISC,LOG_NORMAL)("VGA:ATTR:Read from unkown Index %2X",attr(index));
}
return 0;
};
}
void VGA_SetupAttr(void) {