Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 244 → Rev 245

/DUBwise/trunk/j2me/src/DUBwiseCanvas.java
885,12 → 885,14
symbol_paint(g,symbol_left,6,0);
symbol_left+=5*(symbols_img_tile_width)/4;
 
symbol_paint(g,symbol_left,(mk.SenderOkay())/100,1);
symbol_left+=(symbols_img_tile_width);
if (mk.SenderOkay()!=0)
{
symbol_paint(g,symbol_left,(mk.SenderOkay())/100,1);
symbol_left+=(symbols_img_tile_width);
 
symbol_paint(g,symbol_left,(mk.SenderOkay()/10)%10,1);
symbol_left+=(symbols_img_tile_width);
 
symbol_paint(g,symbol_left,(mk.SenderOkay()/10)%10,1);
symbol_left+=(symbols_img_tile_width);
}
symbol_paint(g,symbol_left,(mk.SenderOkay())%10,1);
symbol_left+=6*(symbols_img_tile_width)/4;
 
1032,9 → 1034,10
case STATEID_DATABUFF:
g.setFont(f2);
 
int lines2paint=(((canvas_height-y_off)/spacer1));
y_off=canvas_height-spacer1;
 
for (int pos_y=0;pos_y<(((canvas_height-spacer1)/spacer1));pos_y++)
for (int pos_y=0;pos_y<lines2paint;pos_y++)
{
g.drawString(mk.get_buff(pos_y) ,0,y_off,Graphics.TOP | Graphics.LEFT);
1334,7 → 1337,7
y_off+=spacer1;
g.drawString( " debug_names:" + mk.stats.debug_names_count + " angles:" + mk.stats.angle_data_count ,0,y_off,Graphics.TOP | Graphics.LEFT);
 
 
y_off+=spacer1;
g.drawString( " other:"+mk.stats.other_data_count,0,y_off,Graphics.TOP | Graphics.LEFT);
 
y_off+=spacer1+3;
1474,7 → 1477,7
 
break;
 
case STATEID_FLIGHTVIEW:
case STATEID_LCD:
/*
g.setClip(canvas_width/2-load_img.getWidth()/6+1,canvas_height/2-load_img.getHeight()/8+1, load_img.getWidth()/4,load_img.getHeight()/3);;
if (( mk.LCD.init_state!=-1)||(mk.LCD.act_mk_page!=mk.LCD.act_user_page)) g.drawImage(load_img,canvas_width/2-load_img.getWidth()/8 - ((((frame_pos/3)%12)%4)*(load_img.getWidth()/4)) ,canvas_height/2-load_img.getHeight()/6- ((((frame_pos/3)%12)/4)*(load_img.getHeight()/3)), g.TOP | g.LEFT);
1640,7 → 1643,7
lcd_lines[1]="^";
break;
case STATEID_FLIGHTVIEW:
case STATEID_LCD:
mk.user_intent=USER_INTENT_LCD;
break;
case STATEID_RESET_PARAMS:
2016,7 → 2019,7
break;
case ACTIONID_LCD :
chg_state(STATEID_FLIGHTVIEW);
chg_state(STATEID_LCD);
break;
 
2153,6 → 2156,12
 
break;
 
case STATEID_LCD:
if (pointer_x<(canvas_width/2))
keyPressed(getKeyCode(LEFT));
else
keyPressed(getKeyCode(RIGHT));
break;
case STATEID_PARAM_MENU:
case STATEID_CONN_DETAILS:
case STATEID_HANDLE_PARAMS:
2167,7 → 2176,7
// if (pointer_y>canvas_height-lcd_img.getHeight()*menu_items.length)
// {
if (lcd_lines.length>max_lines)
act_menu_select=(pointer_y-(canvas_height-lcd_img.getHeight()*max_lines))/lcd_img.getHeight() ;
act_menu_select=(pointer_y-(canvas_height-lcd_img.getHeight()*max_lines))/lcd_img.getHeight() +lcd_off ;
else
act_menu_select=(pointer_y-(canvas_height-lcd_img.getHeight()*lcd_lines.length))/lcd_img.getHeight() ;
keyPressed(getKeyCode(FIRE));
2595,7 → 2604,7
params_editor.keypress(keyCode,getGameAction (keyCode)) ;
break;
 
case STATEID_FLIGHTVIEW:
case STATEID_LCD:
 
if ((keyCode >= this.KEY_NUM0) && (keyCode <= this.KEY_NUM9))
mk.LCD.set_page(keyCode-this.KEY_NUM0);
/DUBwise/trunk/j2me/src/DUBwiseSettings.java
248,10 → 248,9
settings_field[4]=42; // nick
settings_field[5]=42; // roll
settings_field[6]=42; // gier
settings_field[7]=1; // fas
settings_field[7]=1; // gas
settings_field[8]=1; // hight
 
 
settings_field[9]=-4242; // no key
settings_field[10]=-4242; // no key
settings_field[11]=-4242; // no key
/DUBwise/trunk/j2me/src/DUBwiseUIDefinitions.java
8,7 → 8,7
public final static byte STATEID_SELECT_PARAMSET =4;
public final static byte STATEID_EDIT_PARAMS =5;
public final static byte STATEID_HANDLE_PARAMS =6;
public final static byte STATEID_FLIGHTVIEW =7;
public final static byte STATEID_LCD =7;
public final static byte STATEID_RAWDEBUG =8;
public final static byte STATEID_KEYCONTROL =9;
public final static byte STATEID_SETTINGSMENU =10;
/DUBwise/trunk/j2me/src/MKParamsEditor.java
88,12 → 88,33
case PARAMTYPE_BITSWITCH:
lcd_lines[1+2*i]=" " + (((edit_source.get_field_from_act(edit_source.field_positions[act_tab][i]/8)&(1<<edit_source.field_positions[act_tab][i]%8))==0)?"off":"on" ) ;
break;
 
case PARAMTYPE_BYTE:
lcd_lines[1+2*i]=" "+edit_source.get_field_from_act(edit_source.field_positions[act_tab][i]);
 
break;
 
case PARAMTYPE_BITMASK:
lcd_lines[1+2*i]=" "+edit_source.get_field_from_act(edit_source.field_positions[act_tab][i]);
if ((edit_source.get_field_from_act(edit_source.field_positions[act_tab][i])>250)&&(edit_source.get_field_from_act(edit_source.field_positions[act_tab][i])<256))
lcd_lines[2+2*i]+="[Poti"+(edit_source.get_field_from_act(edit_source.field_positions[act_tab][i])-250) +"]"; break;
lcd_lines[1+2*i]+="[Poti"+(edit_source.get_field_from_act(edit_source.field_positions[act_tab][i])-250) +"]";
else
{
lcd_lines[1+2*i]+=" [";
for (int bit=0;bit<8;bit++)
lcd_lines[1+2*i]+=((edit_source.get_field_from_act(edit_source.field_positions[act_tab][i]) & ( 1<<bit)) !=0)?"+":"-";
lcd_lines[1+2*i]+="]";
}
break;
 
case PARAMTYPE_MKBYTE:
lcd_lines[1+2*i]=" "+edit_source.get_field_from_act(edit_source.field_positions[act_tab][i]);
if ((edit_source.get_field_from_act(edit_source.field_positions[act_tab][i])>250)&&(edit_source.get_field_from_act(edit_source.field_positions[act_tab][i])<256))
lcd_lines[1+2*i]+=" [Poti"+(edit_source.get_field_from_act(edit_source.field_positions[act_tab][i])-250) +"]";
break;
 
 
case PARAMTYPE_KEY:
if (edit_source.get_field_from_act(edit_source.field_positions[act_tab][i])==-4242)
lcd_lines[1+2*i]="none";
203,7 → 224,7
if ((act_y!=(act_lcd_lines-1))&&(((keyCode >= Canvas.KEY_NUM0) && (keyCode <= Canvas.KEY_NUM9))|| ( keyCode==KEYCODE_CLEAR)))
{
int act_pos=act_y/2;
if((edit_source.field_types[act_tab][act_pos]==edit_source.PARAMTYPE_BYTE))
if((edit_source.field_types[act_tab][act_pos]==edit_source.PARAMTYPE_BYTE)||(edit_source.field_types[act_tab][act_pos]==edit_source.PARAMTYPE_MKBYTE) ||(edit_source.field_types[act_tab][act_pos]==edit_source.PARAMTYPE_BITMASK))
{
if ((keyCode >= Canvas.KEY_NUM0) && (keyCode <= Canvas.KEY_NUM9))
{
260,12 → 281,16
edit_source.field_from_act_xor((edit_source.field_positions[act_tab][act_pos]/8),1<<(edit_source.field_positions[act_tab][act_pos]%8));
break;
case PARAMTYPE_BITMASK:
case PARAMTYPE_MKBYTE:
case PARAMTYPE_BYTE:
case PARAMTYPE_STICK:
 
edit_source.field_from_act_add(edit_source.field_positions[act_tab][act_pos],1);
edit_source.field_from_act_add_min_max(edit_source.field_positions[act_tab][act_pos],1,0,255);
break;
case PARAMTYPE_STICK:
edit_source.field_from_act_add_min_max(edit_source.field_positions[act_tab][act_pos],1,0,10);
break;
default:
edit_source.field_from_act_add_mod(edit_source.field_positions[act_tab][act_pos],1,edit_source.choice_strings[edit_source.field_types[act_tab][act_pos]-PARAMTYPE_CHOICE].length);
280,9 → 305,13
edit_source.field_from_act_xor((edit_source.field_positions[act_tab][act_pos]/8),1<<(edit_source.field_positions[act_tab][act_pos]%8));
break;
case PARAMTYPE_BITMASK:
case PARAMTYPE_MKBYTE:
case PARAMTYPE_BYTE:
edit_source.field_from_act_add_min_max(edit_source.field_positions[act_tab][act_pos],-1,0,255);
break;
case PARAMTYPE_STICK:
edit_source.field_from_act_add(edit_source.field_positions[act_tab][act_pos],-1);
edit_source.field_from_act_add_min_max(edit_source.field_positions[act_tab][act_pos],-1,0,10);
break;
default:
edit_source.field_from_act_add_mod(edit_source.field_positions[act_tab][act_pos],1,edit_source.choice_strings[edit_source.field_types[act_tab][act_pos]-PARAMTYPE_CHOICE].length);